rpms/ghc-haskell-src-exts/devel ghc-haskell-src-exts.spec,1.3,1.4
Jens Petersen
petersen at fedoraproject.org
Sat Apr 25 09:31:37 UTC 2009
Author: petersen
Update of /cvs/pkgs/rpms/ghc-haskell-src-exts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27495
Modified Files:
ghc-haskell-src-exts.spec
Log Message:
sync with cabal2spec-0.15
Index: ghc-haskell-src-exts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-haskell-src-exts/devel/ghc-haskell-src-exts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghc-haskell-src-exts.spec 19 Mar 2009 21:26:08 -0000 1.3
+++ ghc-haskell-src-exts.spec 25 Apr 2009 09:31:06 -0000 1.4
@@ -1,8 +1,4 @@
%global pkg_name haskell-src-exts
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
%bcond_without doc
%bcond_without prof
@@ -12,7 +8,7 @@
Name: ghc-%{pkg_name}
Version: 0.4.8
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Library for Manipulating Haskell source
Group: Development/Libraries
License: BSD
@@ -21,12 +17,13 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha
-BuildRequires: ghc = %{ghc_version}
+# for latest macros.ghc
+BuildRequires: ghc >= 6.10.2-3
%if %{with doc}
-BuildRequires: ghc-doc = %{ghc_version}
+BuildRequires: ghc-doc
%endif
%if %{with prof}
-BuildRequires: ghc-prof = %{ghc_version}
+BuildRequires: ghc-prof
%endif
BuildRequires: ghc-cpphs-devel
BuildRequires: ghc-cpphs-prof
@@ -93,7 +90,7 @@
%build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
%cabal build
%if %{with doc}
%cabal haddock
@@ -138,14 +135,12 @@
%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
-#%%doc LICENSE
%{_docdir}/%{name}-%{version}
%if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
-%{pkg_docdir}
%endif
@@ -156,6 +151,10 @@
%changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 0.4.8-5
+- sync with cabal2spec-0.15
+- buildrequires >= 6.10.2-3 for latest macros
+
* Thu Mar 19 2009 Conrad Meyer <konrad at tylerc.org> - 0.4.8-4
- Update to new cabal2spec template.
More information about the fedora-extras-commits
mailing list