rpms/ghc-uniplate/F-11 ghc-uniplate.spec,1.1,1.2

Jens Petersen petersen at fedoraproject.org
Sat May 30 06:24:32 UTC 2009


Author: petersen

Update of /cvs/pkgs/rpms/ghc-uniplate/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5692

Modified Files:
	ghc-uniplate.spec 
Log Message:
backport from devel for ghc-6.10.3 rebuild


Index: ghc-uniplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-uniplate/F-11/ghc-uniplate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-uniplate.spec	22 Mar 2009 21:45:12 -0000	1.1
+++ ghc-uniplate.spec	30 May 2009 06:24:02 -0000	1.2
@@ -1,8 +1,4 @@
 %global pkg_name uniplate
-%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:        1.2.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Uniform type generic traversals
 Group:          Development/Libraries
 License:        BSD
@@ -21,12 +17,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
@@ -78,7 +74,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
@@ -123,14 +119,13 @@ fi
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
-#%%doc LICENSE
+%doc LICENSE
 %{_docdir}/%{name}-%{version}
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -141,6 +136,10 @@ fi
 
 
 %changelog
+* Thu May 28 2009 Jens Petersen <petersen at redhat.com> - 1.2.0.3-4
+- update to cabal2spec-0.16
+- uncomment LICENSE in devel filelist!
+
 * Fri Mar 20 2009 Conrad Meyer <konrad at tylerc.org> - 1.2.0.3-3
 - Fix URL.
 




More information about the scm-commits mailing list