rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.25, 1.26 ghc-rpm-macros.spec, 1.28, 1.29
Jens Petersen
petersen at fedoraproject.org
Mon Jun 28 07:33:24 UTC 2010
- Previous message: rpms/kernel/devel kernel.spec, 1.2037.2.1, 1.2037.2.2 linux-2.6-execshield.patch, 1.117, 1.117.8.1
- Next message: rpms/psacct/devel psacct.spec, 1.50, 1.51 psacct-6.3.2-sa-manfix.patch, 1.1, NONE psacct-6.5.1-exit.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: petersen
Update of /cvs/pkgs/rpms/ghc-rpm-macros/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8125
Modified Files:
ghc-rpm-macros.ghc ghc-rpm-macros.spec
Log Message:
- support hscolour'ing of src via haddock
- really remove redundant summary and description option flags
Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ghc-rpm-macros.ghc 26 Jun 2010 08:53:39 -0000 1.25
+++ ghc-rpm-macros.ghc 28 Jun 2010 07:33:21 -0000 1.26
@@ -93,7 +93,7 @@ Requires: ghc-%{-n:%{-n*}}%{!-n:%{
%{nil}
# ghc_binlib_package [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version]
-%ghc_binlib_package(n:c:h:l:v:s:d:)\
+%ghc_binlib_package(n:c:h:l:v:)\
%define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\
%define ghc_pkg_name ghc-%{local_pkg_name}\
%package -n %{ghc_pkg_name}\
@@ -112,11 +112,8 @@ This package provides the shared library
%ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-conf || :
-# for docs post and postun
-%ghc_reindex_haddock ( cd %{ghcdocbasedir}/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
-
# ghc_package_devel [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version]
-%ghc_package_devel(n:c:h:l:v:s:d:)\
+%ghc_package_devel(n:c:h:l:v:)\
%define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\
%define ghc_pkg_name ghc-%{local_pkg_name}\
%package -n %{ghc_pkg_name}-devel\
@@ -145,11 +142,12 @@ This package contains the development fi
%defattr(-,root,root,-)\
%{nil}
+# for docs post and postun
# re-index haddock
%ghc_reindex_haddock ( cd %{ghcdocbasedir}/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
# ghc_package_doc [-n pkgname] [-h pkgdepslist] [-l licensetag] [-v version]
-%ghc_package_doc(n:h:l:v:s:d:)\
+%ghc_package_doc(n:h:l:v:)\
%define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\
%define ghc_pkg_name ghc-%{local_pkg_name}\
%package -n %{ghc_pkg_name}-doc\
@@ -179,7 +177,7 @@ fi\
%{nil}
# ghc_package_prof [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version]
-%ghc_package_prof(n:h:l:v:s:d:)\
+%ghc_package_prof(n:h:l:v:)\
%define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\
%define ghc_pkg_name ghc-%{local_pkg_name}\
%package -n %{ghc_pkg_name}-prof\
@@ -215,7 +213,7 @@ find $RPM_BUILD_ROOT -type f -exec sh -c
%ghc_lib_build\
%cabal_configure --ghc -p\
%cabal build\
-%cabal haddock
+%cabal haddock %{?with_hscolour:--hyperlink-source}
# ghc_bin_install
%ghc_bin_install\
Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ghc-rpm-macros.spec 26 Jun 2010 08:53:39 -0000 1.28
+++ ghc-rpm-macros.spec 28 Jun 2010 07:33:22 -0000 1.29
@@ -1,5 +1,5 @@
Name: ghc-rpm-macros
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
Summary: Macros for building packages for GHC
@@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jun 28 2010 Jens Petersen <petersen at redhat.com> - 0.7.1-1
+- support hscolour'ing of src from haddock
+- really remove redundant summary and description option flags
+
* Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 0.7.0-1
- new ghc_bin_build, ghc_bin_install, ghc_lib_build, ghc_lib_install
- Previous message: rpms/kernel/devel kernel.spec, 1.2037.2.1, 1.2037.2.2 linux-2.6-execshield.patch, 1.117, 1.117.8.1
- Next message: rpms/psacct/devel psacct.spec, 1.50, 1.51 psacct-6.3.2-sa-manfix.patch, 1.1, NONE psacct-6.5.1-exit.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list