Author: petersen
Update of /cvs/pkgs/rpms/cpphs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17371
Modified Files:
cpphs.spec
Log Message:
backport from devel for ghc-6.10.3 rebuild
Index: cpphs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpphs/F-11/cpphs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cpphs.spec 2 Mar 2009 02:23:34 -0000 1.3
+++ cpphs.spec 29 May 2009 22:48:06 -0000 1.4
@@ -1,8 +1,3 @@
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}
-
%bcond_without doc
%bcond_without prof
@@ -11,7 +6,7 @@
Name: cpphs
Version: 1.6
-Release: 6%{?dist}
+Release: 8%{?dist}
Summary: C pre-processor for Haskell
Group: Development/Languages
License: GPL+ and LGPLv2+
@@ -20,12 +15,12 @@ Source0: http://hackage.haskell.o
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha
-BuildRequires: ghc = %{ghc_version}
+BuildRequires: ghc, ghc-rpm-macros
%if %{with doc}
-BuildRequires: ghc-doc = %{ghc_version}
+BuildRequires: ghc-doc
%endif
%if %{with prof}
-BuildRequires: ghc-prof = %{ghc_version}
+BuildRequires: ghc-prof
%endif
%description
@@ -53,9 +48,9 @@ Haskell %{name} library for ghc.
%if %{with doc}
%package -n ghc-%{name}-doc
-Summary: Documentation for %{name}
-Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
+Summary: Documentation for %{name}
+Group: Development/Libraries
+Requires: ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}
@@ -83,7 +78,7 @@ This package contains profiling librarie
%build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
%cabal build
%if %{with doc}
%cabal haddock
@@ -138,9 +133,8 @@ fi
%if %{with doc}
-%files -n ghc-%{name}-doc
+%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
%defattr(-,root,root,-)
-%{pkg_docdir}
%endif
@@ -151,6 +145,12 @@ fi
%changelog
+* Sun May 17 2009 Jens Petersen <petersen at redhat.com> - 1.6-8
+- buildrequires ghc-rpm-macros (cabal2spec-0.16)
+
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 1.6-7
+- update to cabal2spec-0.14
+
* Mon Mar 2 2009 Jens Petersen <petersen at redhat.com> - 1.6-6
- update to cabal2spec-0.12:
- add devel subpackage