rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.29,1.30

Jens Petersen petersen at fedoraproject.org
Thu Jan 14 16:26:09 UTC 2010


Author: petersen

Update of /cvs/pkgs/rpms/ghc-gtk2hs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28132

Modified Files:
	ghc-gtk2hs.spec 
Log Message:
fix prof filelists using find in pkg_filelists


Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ghc-gtk2hs.spec	14 Jan 2010 15:03:17 -0000	1.29
+++ ghc-gtk2hs.spec	14 Jan 2010 16:26:09 -0000	1.30
@@ -29,7 +29,7 @@ management, unicode support, and wide co
 Summary:        Haskell binding for gtk2 and related libraries
 Name:           ghc-%{pkg_name}
 Version:        0.10.1.20100110
-Release:        1%{?dist}
+Release:        2%{?dist}
 # cairo/ and svgcairo/ are FreeBSD
 # compat/ is BSD
 # tools/c2hs (used to build) is GPLv2+, LGPLv2+
@@ -119,15 +119,18 @@ cat > ../ghc-%1-devel.files << EOF\
 %{ghcpkgbasedir}/package.conf.d/%1-%{version}.conf\
 %{ghcpkgdir}/libHS%1.a\
 %{ghcpkgdir}/HS%1.o\
-%{ghcpkgdir}/imports/%1\
 EOF\
+find $RPM_BUILD_ROOT%{ghcpkgdir}/imports/%1 -type d -printf "%%%%dir %%p\\n" >> ../ghc-%1-devel.files\
+find $RPM_BUILD_ROOT%{ghcpkgdir}/imports/%1 -type f -name "*.hi" >> ../ghc-%1-devel.files\
 %if %{with prof}\
 cat > ../ghc-%1-prof.files << EOF\
 %defattr(-,root,root,-)\
 %{ghcpkgdir}/libHS%{1}_p.a\
 EOF\
+find $RPM_BUILD_ROOT%{ghcpkgdir}/imports/%1 -type f -name "*.p_hi" >> ../ghc-%1-prof.files\
 %endif\
 echo -n > ../ghc-%1-doc.files\
+sed -i -e "s!${RPM_BUILD_ROOT}!!g" ../ghc-%{1}*.files\
 %{nil}
 
 %ghc_binlib_package -n cairo -c cairo-devel -h ghc-glib-devel,ghc-mtl-devel
@@ -250,6 +253,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 15 2010 Jens Petersen <petersen at redhat.com> - 0.10.1.20100110-2
+- fix prof filelists using find in pkg_filelists
+
 * Fri Jan 15 2010 Jens Petersen <petersen at redhat.com> - 0.10.1.20100110-1
 - update to darcs snapshot for ghc-6.12.1 build
 - add shared bcond (disabled until work out how to build shared)



More information about the scm-commits mailing list