From 2e0abdb8067ebd41b1b662e3f20f34fe23558d87 Mon Sep 17 00:00:00 2001
From: Petr Šabata <contyk@redhat.com>
Date: Jul 31 2013 13:31:39 +0000
Subject: Correct the License tag once again


- Utilize the %{name} and %{_mandir} macros a bit more
- Don't package the INSTALL file

---

diff --git a/dash.spec b/dash.spec
index 528d362..778e0d1 100644
--- a/dash.spec
+++ b/dash.spec
@@ -1,11 +1,15 @@
 Name:           dash
 Version:        0.5.7
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Small and fast POSIX-compliant shell
 Group:          System Environment/Shells
-License:        BSD and GPLv2+
-URL:            http://gondor.apana.org.au/~herbert/dash/
-Source0:        http://gondor.apana.org.au/~herbert/dash/files/dash-%{version}.tar.gz
+# BSD: DASH in general
+# GPLv2+: From src/mksignames.c
+# Public Domain: From src/bltin/test.c
+# Copyright only: From src/hetio.h
+License:        BSD and GPLv2+ and Public Domain and Copyright only
+URL:            http://gondor.apana.org.au/~herbert/%{name}/
+Source0:        http://gondor.apana.org.au/~herbert/%{name}/files/%{name}-%{version}.tar.gz
 
 %description
 DASH is a POSIX-compliant implementation of /bin/sh that aims to be as small as
@@ -23,22 +27,31 @@ make %{?_smp_mflags}
 make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/bin
 mv %{buildroot}%{_bindir}/dash %{buildroot}/bin/
-rm -rf %{buildroot}%{_bindir}/
+rmdir %{buildroot}%{_bindir}/
 
 %post
-grep -q '^/bin/dash$' /etc/shells || echo '/bin/dash' >> /etc/shells
+grep -q '^/bin/dash$' %{_sysconfdir}/shells || \
+    echo '/bin/dash' >> %{_sysconfdir}/shells
 
 %postun
 if [ $1 -eq 0 ]; then
-    sed -i '/^\/bin\/dash$/d' /etc/shells
+    sed -i '/^\/bin\/dash$/d' %{_sysconfdir}/shells
 fi
 
 %files
-%doc INSTALL COPYING ChangeLog
-/bin/dash
-%{_datadir}/man/man1/dash.1.gz
+%doc COPYING ChangeLog
+/bin/%{name}
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Jul 31 2013 Petr Šabata <contyk@redhat.com> - 0.5.7-7
+- Correct the License tag once again
+- Utilize the %%{name} and %%{_mandir} macros a bit more
+- Don't package the INSTALL file
+
+* Mon Jun 10 2013 Petr Šabata <contyk@redhat.com> - 0.5.7-6
+- Use the sysconfdir macro in scriptlets
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild