rpms/ghc/devel ghc.spec,1.30,1.31
Bryan O'Sullivan (bos)
fedora-extras-commits at redhat.com
Tue Jan 22 01:11:26 UTC 2008
- Previous message (by thread): rpms/gnome-do/devel .cvsignore, 1.2, 1.3 gnome-do-desktopfile.patch, 1.1, 1.2 gnome-do-libdir.patch, 1.1, 1.2 gnome-do.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/elfutils/F-7 elfutils-0.130-fixes.patch,1.2,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bos
Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17810
Modified Files:
ghc.spec
Log Message:
Sync up with fixes from F-8
Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ghc.spec 7 Jan 2008 23:24:04 -0000 1.30
+++ ghc.spec 22 Jan 2008 01:10:50 -0000 1.31
@@ -18,7 +18,7 @@
Name: ghc
Version: 6.8.2
-Release: 4%{?dist}
+Release: 8%{?dist}
Summary: Glasgow Haskell Compilation system
# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
ExcludeArch: alpha ppc64
@@ -113,9 +113,11 @@
--bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
--libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
- --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir}
+ --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
+ --docdir=%{_docdir}/%{name}-%{version} \
+ --htmldir=%{_docdir}/%{name}-%{version}
-cat <<'HADDOCK_PATH_HACK' >> mk/build.mk
+cat <<HADDOCK_PATH_HACK >> mk/build.mk
docdir := %{_docdir}/%{name}-%{version}
htmldir := $(docdir)
dvidir := $(docdir)
@@ -140,6 +142,10 @@
%if %{build_doc}
make DESTDIR=${RPM_BUILD_ROOT} XMLDocWays="html" HADDOCK_DOCS=YES install-docs
+if [ -d ${RPM_BUILD_ROOT}/%{_docdir}/%{name}/libraries ]; then
+ mv ${RPM_BUILD_ROOT}/%{_docdir}/%{name}/libraries \
+ ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}
+fi
cp libraries/*.html ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}/libraries
%endif
@@ -226,8 +232,11 @@
%changelog
-* Mon Jan 07 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.8.2-3
-- Fix haddock installation paths
+* Sun Jan 06 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.8.2-7
+- More attempts to fix docdir
+
+* Sun Jan 06 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.8.2-6
+- Fix docdir
* Tue Dec 12 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.8.2-1
- Update to 6.8.2
- Previous message (by thread): rpms/gnome-do/devel .cvsignore, 1.2, 1.3 gnome-do-desktopfile.patch, 1.1, 1.2 gnome-do-libdir.patch, 1.1, 1.2 gnome-do.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/elfutils/F-7 elfutils-0.130-fixes.patch,1.2,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list