[ghc-rpm-macros] simplify adding shared subpackage license file; own ghc-deps.sh not /usr/lib/rpm

[Jens Petersen]

commit 876ea626db787fe6c445ba92916ec8aad82154ff
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Jan 29 22:34:52 2011 +1000

    simplify adding shared subpackage license file; own ghc-deps.sh not /usr/lib/rpm

 ghc-rpm-macros.ghc  |    8 ++++----
 ghc-rpm-macros.spec |    8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 16d060a..00f48cf 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -33,11 +33,11 @@ echo "%attr(755,root,root) %{pkgdir}/libHS%{pkgnamever}-ghc%{ghc_version}.so" >>
 fi\
 %endif\
 echo "%defattr(-,root,root,-)" > %{basepkg}-devel.files\
-for dir in %{_docdir}/{ghc-,}%{pkgnamever}; do\
-if [ -d "%{buildroot}${dir}" ]; then\
-echo "${dir}" >> %{basepkg}%{?without_shared:-devel}.files\
+%if 0%{!?1:1}\
+if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
+  echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?without_shared:-devel}.files\
 fi\
-done\
+%endif\
 echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf" >> %{basepkg}-devel.files\
 if [ -d "%{buildroot}%{pkgdir}" ]; then\
 find %{buildroot}%{pkgdir} -type d | sed "s/^/%dir /" >> %{basepkg}-devel.files\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 76cd853..9a3ccc5 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.11.5
+Version:	0.11.6
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -43,10 +43,14 @@ install -p %{SOURCE3} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS
 %config(noreplace) %{_sysconfdir}/rpm/macros.ghc
-%{_prefix}/lib/rpm
+%{_prefix}/lib/rpm/ghc-deps.sh
 
 
 %changelog
+* Sat Jan 29 2011 Jens Petersen <petersen at redhat.com> - 0.11.6-1
+- simplify adding shared subpackage license file
+- own ghc-deps.sh not /usr/lib/rpm
+
 * Sun Jan 23 2011 Jens Petersen <petersen at redhat.com> - 0.11.5-1
 - add rpm hash requires for dynamic executables in ghc-deps.sh
 - compile Setup in cabal macro