rpms/ghc-X11/F-11 ghc-X11.spec,1.4,1.5

[Jens Petersen]

Author: petersen

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

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


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/F-11/ghc-X11.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ghc-X11.spec	4 Apr 2009 05:54:36 -0000	1.4
+++ ghc-X11.spec	30 May 2009 10:01:58 -0000	1.5
@@ -1,19 +1,15 @@
 %global pkg_name X11
-%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 prof
 %bcond_without doc
+%bcond_without prof
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        1.4.5
-Release:        6%{?dist}
-Summary:        Haskell %{pkg_name} librar
+Release:        11%{?dist}
+Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
 License:        BSD
@@ -22,17 +18,17 @@ 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
-BuildRequires: libXinerama-devel, libX11-devel, libXext-devel
+BuildRequires:  libXinerama-devel, libX11-devel, libXext-devel
 
 %description
-This package provides the Haskell %{pkg_name} library.
+This package provides the Haskell %{pkg_name} library for ghc.
 
 The library consists of bindings to direct translations of the C bindings; for
 documentation of these calls, refer to "The Xlib Programming
@@ -53,9 +49,9 @@ built for ghc-%{ghc_version}.
 
 %if %{with doc}
 %package 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}
 
@@ -66,13 +62,14 @@ This package contains development docume
 
 %if %{with prof}
 %package prof
-Summary: Profiling libraries for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: ghc-prof = %{ghc_version}
+Summary:        Profiling libraries for %{name}
+Group:          Development/Libraries
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       ghc-prof = %{ghc_version}
 
 %description prof
-This package contains profiling libraries for %{name}.
+This package contains profiling libraries for %{name}
+built for ghc-%{ghc_version}.
 %endif
 
 
@@ -81,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
@@ -130,9 +127,8 @@ fi
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -143,6 +139,27 @@ fi
 
 
 %changelog
+* Sat May 16 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-11
+- buildrequires ghc-rpm-macros (cabal2spec-0.16)
+
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-10
+- ghc_version is now in macros.ghc
+
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-9
+- try defining ghc_version with global
+
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-8
+- define ghc_version correctly
+
+* Mon Apr 20 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-7
+- rebuild with ghc-6.10.2
+- update to latest cabal2spec template and macros.ghc
+  - pkg_libdir and pkg_docdir moved to macros.ghc
+  - drop ghc_version from buildrequires
+  - fix prof configure
+  - add doc filelist
+  - get ghc_version from ghc
+
 * Sat Apr  4 2009 Yaakov M. Nemoy <yankee at localhost.localdomain> - 1.4.5-6
 - rebuild bump to raise EVR manually, to match with F-10 branch