rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- use ghc_version_override to override ghc_version

Browse Source 
- fix pkg .conf filelist match
This commit is contained in:
Jens Petersen 2009-12-15 21:50:31 +00:00
parent b22ec8887d
commit 8b0ec9d34e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghc-rpm-macros.ghc
View File

@ -19,7 +19,7 @@ echo '%defattr(-,root,root,-)' > %1.files \
echo '%dir %{ghcpkgdir}' >> %1.files \
echo '%attr(755,root,root) %{ghcpkgdir}/libHS%{?pkg_name}%{!?pkg_name:%name}-%{version}-ghc%{ghc_version}.so' >> %1.files \
echo '%defattr(-,root,root,-)' > %1-devel.files \
echo '%{_libdir}/ghc-%{ghc_version}/package.conf.d/%{?pkg_name}%{!?pkg_name:%name}-%{version}-*.conf' >> %1-devel.files \
echo '%{_libdir}/ghc-%{ghc_version}/package.conf.d/%{?pkg_name}%{!?pkg_name:%name}-%{version}*.conf' >> %1-devel.files \
find ${RPM_BUILD_ROOT}%{ghcpkgdir} -type d | sed 's/^/%dir /' >> %1-devel.files \
find ${RPM_BUILD_ROOT}%{ghcpkgdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' -o -name 'libHS*.so' \\) >> %1-devel.files \
echo '%defattr(-,root,root,-)' > %1-prof.files \
@ -31,7 +31,7 @@ echo '%{ghcdocdir}' >> %1-doc.files \
%ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
%ghc_version %{!?ghc_version:%(ghc --numeric-version)}%{?ghc_version}
%ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override}
%ghc_pkg_ver() %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//")

6
ghc-rpm-macros.spec
View File

@ -1,5 +1,5 @@
Name: ghc-rpm-macros
Version: 0.3.0
Version: 0.3.1
Release: 1%{?dist}
Summary: Macros for building packages for GHC
@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Dec 15 2009 Jens Petersen <petersen@redhat.com> - 0.3.1-1
- use ghc_version_override to override ghc_version
- fix pkg .conf filelist match
* Sat Dec 12 2009 Jens Petersen <petersen@redhat.com> - 0.3.0-1
- major updates for ghc-6.12, package.conf.d, and shared libraries
- add shared support to cabal_configure, ghc_gen_filelists