rpms/ghc/devel ghc-rpm-macros.ghc,1.6,1.7 ghc.spec,1.54,1.55
Jens Petersen
petersen at fedoraproject.org
Thu Oct 23 06:40:56 UTC 2008
- Previous message (by thread): rpms/libfplll/devel import.log, NONE, 1.1 libfplll.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/ibus/devel .cvsignore, 1.19, 1.20 ibus.spec, 1.32, 1.33 sources, 1.22, 1.23
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: petersen
Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15121
Modified Files:
ghc-rpm-macros.ghc ghc.spec
Log Message:
- cabal_configure does not need redundant --haddockdir
- actually ghc-pkg no longer seems to create package.conf.old backups
- include LICENSE in doc
Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ghc-rpm-macros.ghc 23 Oct 2008 03:00:41 -0000 1.6
+++ ghc-rpm-macros.ghc 23 Oct 2008 06:40:25 -0000 1.7
@@ -1,7 +1,7 @@
%cabal %{_bindir}/runhaskell Setup
%cabal_configure \
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{pkg_docdir} --haddockdir=%{pkg_docdir} --libsubdir='$compiler/$pkgid'
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{pkg_docdir} --libsubdir='$compiler/$pkgid'
%cabal_build \
%cabal build \
Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ghc.spec 23 Oct 2008 03:42:59 -0000 1.54
+++ ghc.spec 23 Oct 2008 06:40:25 -0000 1.55
@@ -16,7 +16,7 @@
Name: ghc
Version: 6.10.0.20081007
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Glasgow Haskell Compilation system
# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
ExcludeArch: alpha ppc64
@@ -140,9 +140,6 @@
cat rpm-dir.files rpm-prof.files > rpm-prof-filelist
%endif
-# create package.conf.old
-touch $RPM_BUILD_ROOT%{_libdir}/ghc-%{version}/package.conf.old
-
# these are handled as alternatives
for i in hsc2hs runhaskell; do
if [ -x ${RPM_BUILD_ROOT}%{_bindir}/$i-ghc ]; then
@@ -176,7 +173,6 @@
update-alternatives --install %{_bindir}/hsc2hs hsc2hs \
%{_bindir}/hsc2hs-ghc 500
-
%post doc
( cd %{_docdir}/ghc/libraries && ./gen_contents_index ) || :
@@ -186,7 +182,6 @@
update-alternatives --remove hsc2hs %{_bindir}/hsc2hs-ghc
fi
-
%files -f rpm-base-filelist
%defattr(-,root,root,-)
%doc ANNOUNCE HACKING LICENSE README
@@ -194,19 +189,17 @@
%{_bindir}/*
%{_sysconfdir}/rpm/macros.ghc
%config(noreplace) %{_libdir}/ghc-%{version}/package.conf
-%ghost %{_libdir}/ghc-%{version}/package.conf.old
-
%if %{build_prof}
%files prof -f rpm-prof-filelist
%defattr(-,root,root,-)
%endif
-
%if %{build_doc}
%files doc -f rpm-doc-dir.files
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}
+%{_docdir}/%{name}/LICENSE
%{_docdir}/%{name}/index.html
%{_docdir}/%{name}/libraries/gen_contents_index
%dir %{_docdir}/%{name}/libraries
@@ -219,8 +212,12 @@
%ghost %{_docdir}/%{name}/libraries/plus.gif
%endif
-
%changelog
+* Thu Oct 23 2008 Jens Petersen <petersen at redhat.com> - 6.10.0.20081007-9
+- remove redundant --haddockdir from cabal_configure
+- actually ghc-pkg no longer seems to create package.conf.old backups
+- include LICENSE in doc
+
* Thu Oct 23 2008 Jens Petersen <petersen at redhat.com> - 6.10.0.20081007-8
- need to create ghost package.conf.old for ghc-6.10
- Previous message (by thread): rpms/libfplll/devel import.log, NONE, 1.1 libfplll.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/ibus/devel .cvsignore, 1.19, 1.20 ibus.spec, 1.32, 1.33 sources, 1.22, 1.23
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list