[ghc-rpm-macros] make only ghc-PKG own libdir/ghc-ver/pkg-ver/ (#893777)

[Jens Petersen]

commit 59daf96cb2610446a1f550c265f500b5a71f607f
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 18 18:52:08 2013 +0900

    make only ghc-PKG own libdir/ghc-ver/pkg-ver/ (#893777)
    
    thanks to Michael Scherer for reporting

 ghc-rpm-macros.ghc  |    4 ++--
 ghc-rpm-macros.spec |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 404bb07..3c04aae 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -42,9 +42,9 @@ fi
 %define pkgdir %{ghclibdir}/%{pkgnamever}\
 %define docdir %{ghclibdocdir}/%{pkgnamever}\
 rm -f %{basepkg}.files %{basepkg}-devel.files\
+echo "%dir %{pkgdir}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
 %if %{undefined ghc_without_shared}\
 if [ -d "%{buildroot}%{pkgdir}" ]; then\
-echo "%dir %{pkgdir}" >> %{basepkg}.files\
 echo "%attr(755,root,root) %{pkgdir}/libHS%{pkgnamever}-ghc%{ghc_version}.so" >> %{basepkg}.files\
 fi\
 %endif\
@@ -67,7 +67,7 @@ fi\
 %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\
+find %{buildroot}%{pkgdir} -mindepth 1 -type d | sed "s/^/%dir /" >> %{basepkg}-devel.files\
 find %{buildroot}%{pkgdir} ! \\( -type d -o -name "libHS*.so" \\) >> %{basepkg}-devel.files\
 fi\
 if [ -d "%{buildroot}%{docdir}" ]; then\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index cc8015d..5444add 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        0.97.5
+Version:        0.97.6
 Release:        1%{?dist}
 Summary:        Macros for building packages for GHC
 
@@ -75,6 +75,9 @@ EOF
 
 
 %changelog
+* Fri Jan 18 2013 Jens Petersen <petersen at redhat.com> - 0.97.6-1
+- be more careful about library pkgdir ownership (#893777)
+
 * Mon Dec  3 2012 Jens Petersen <petersen at redhat.com> - 0.97.5-1
 - add cabal-tweak-flag script for toggling flag default