rpms/hscolour/F-11 .cvsignore, 1.2, 1.3 hscolour.spec, 1.1, 1.2 sources, 1.2, 1.3

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/hscolour/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15196

Modified Files:
	.cvsignore hscolour.spec sources 
Log Message:
backport from devel for ghc-6.10.3 rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hscolour/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Mar 2009 04:32:24 -0000	1.2
+++ .cvsignore	30 May 2009 10:13:28 -0000	1.3
@@ -1 +1 @@
-hscolour-1.12.tar.gz
+hscolour-1.13.tar.gz


Index: hscolour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hscolour/F-11/hscolour.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hscolour.spec	18 Mar 2009 04:32:25 -0000	1.1
+++ hscolour.spec	30 May 2009 10:13:29 -0000	1.2
@@ -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
 
@@ -10,8 +5,8 @@
 %global debug_package %{nil}
 
 Name:           hscolour
-Version:        1.12
-Release:        2%{?dist}
+Version:        1.13
+Release:        1%{?dist}
 Summary:        Colourizes Haskell code
 
 Group:          Development/Tools
@@ -21,12 +16,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
@@ -68,7 +63,8 @@ Requires: ghc-%{name}-devel = %{version}
 Requires: ghc-prof = %{ghc_version}
 
 %description -n ghc-%{name}-prof
-This package contains profiling libraries for %{name}.
+This package contains profiling libraries for %{name}
+built for ghc-%{ghc_version}.
 %endif
 
 
@@ -77,7 +73,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
@@ -131,9 +127,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
 
 
@@ -144,6 +139,13 @@ fi
 
 
 %changelog
+* Sun May 24 2009 Jens Petersen <petersen at redhat.com> - 1.13-1
+- update to 1.13
+- buildrequires ghc-rpm-macros (cabal2spec-0.16)
+
+* Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 1.12-3
+- sync with cabal2spec-0.15
+
 * Tue Mar 10 2009 Jens Petersen <petersen at redhat.com> - 1.12-2
 - fix url (#488665)
 - fix HsColour permissions (#488665)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hscolour/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Mar 2009 04:32:25 -0000	1.2
+++ sources	30 May 2009 10:13:29 -0000	1.3
@@ -1 +1 @@
-4328a84b87b245693bcf10b49c608e43  hscolour-1.12.tar.gz
+a48b90999b0b28903e774e53fb4ec4e6  hscolour-1.13.tar.gz