fix ghc-deps.sh for without_shared libraries

ghc-deps.sh

@@ -18,6 +18,8 @@ case $MODE in
     *) echo "`basename $0`: Need --provides or --requires" ; exit 1
 esac
 
+SHARED=$(find $PKGBASEDIR -type f -name '*.so')
+
 GHCVERSION=$(ghc --numeric-version)
 
 files=$(cat)
@@ -33,7 +35,11 @@ for i in $files; do
 	    case $LIB_FILE in
 		*.so) META=ghc ;;
 		*_p.a) META=ghc-prof SELF=ghc-devel ;;
-      *.a) META=ghc-devel SELF=ghc ;;
+		*.a) META=ghc-devel
+		    if [ -n "$SHARED" ]; then
+			SELF=ghc
+		    fi
+		    ;;
 	    esac
 	    if [ -n "$META" ]; then
 		PKGVER=$(echo $LIB_FILE | sed -e "s%$PKGBASEDIR/\([^/]\+\)/libHS.*%\1%")

ghc-rpm-macros.ghc

@@ -1,3 +1,6 @@
+# RPM Macros for packaging Haskell cabalized packages
+# see https://fedoraproject.org/wiki/PackagingDrafts/Haskell for more details
+
 # "cabal"
 %cabal [ -x Setup ] || ghc --make -dynamic Setup\
 ./Setup

ghc-rpm-macros.spec

@@ -1,6 +1,6 @@
 Name:		ghc-rpm-macros
-Version:	0.11.6
-Release:	2%{?dist}
+Version:	0.11.7
+Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
 Group:		Development/Libraries
@@ -47,6 +47,9 @@ install -p %{SOURCE3} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm
 
 
 %changelog
+* Thu Feb 10 2011 Jens Petersen <petersen@redhat.com> - 0.11.7-1
+- fix ghc-deps.sh for without_shared libraries
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild