rpms/cpphs/devel cpphs.spec,1.2,1.3

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/cpphs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13150

Modified Files:
	cpphs.spec 
Log Message:
update to cabal2spec-0.12:
- add devel subpackage
- use global
- update archs




Index: cpphs.spec
===================================================================
RCS file: /cvs/extras/rpms/cpphs/devel/cpphs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cpphs.spec	24 Feb 2009 09:28:20 -0000	1.2
+++ cpphs.spec	2 Mar 2009 02:23:34 -0000	1.3
@@ -1,26 +1,29 @@
-%define ghc_version 6.10.1
+%global ghc_version 6.10.1
 
-%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
-%define pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}
+%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
+%global pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}
 
-%bcond_without prof
 %bcond_without doc
+%bcond_without prof
 
 # ghc does not emit debug information
-%define debug_package %{nil}
+%global debug_package %{nil}
 
 Name:           cpphs
 Version:        1.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        C pre-processor for Haskell
 Group:          Development/Languages
 License:        GPL+ and LGPLv2+
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# ghc has only been bootstrapped on the following archs:
-ExclusiveArch:  i386 x86_64 ppc
+# fedora ghc archs:
+ExclusiveArch:  %{ix86} x86_64 ppc alpha
 BuildRequires:  ghc = %{ghc_version}
+%if %{with doc}
+BuildRequires:  ghc-doc = %{ghc_version}
+%endif
 %if %{with prof}
 BuildRequires:  ghc-prof = %{ghc_version}
 %endif
@@ -36,23 +39,24 @@
 an option to turn off macro-expansion.
 
 
-%package -n ghc-%{name}
-Summary:        Libraries for %{name}
+%package -n ghc-%{name}-devel
+Summary:        Haskell library for %{name}
 Group:          Development/Libraries
 License:        LGPLv2+
-Provides:       ghc-%{name}-devel = %{version}-%{release}
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
 
-%description -n ghc-%{name}
+%description -n ghc-%{name}-devel
 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}
+Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
 
 %description -n ghc-%{name}-doc
@@ -60,12 +64,13 @@
 library.
 %endif
 
+
 %if %{with prof}
 %package -n ghc-%{name}-prof
 Summary:        Profiling libraries for %{name}
 Group:          Development/Libraries
 License:        LGPLv2+
-Requires:       ghc-%{name} = %{version}-%{release}
+Requires:       ghc-%{name}-devel = %{version}-%{release}
 Requires:       ghc-prof = %{ghc_version}
 
 %description -n ghc-%{name}-prof
@@ -97,7 +102,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n ghc-%{name}
+%post -n ghc-%{name}-devel
 %ghc_register_pkg
 
 
@@ -107,7 +112,7 @@
 %endif
 
 
-%preun -n ghc-%{name}
+%preun -n ghc-%{name}-devel
 if [ "$1" -eq 0 ] ; then
   %ghc_unregister_pkg
 fi
@@ -127,7 +132,7 @@
 %{_bindir}/%{name}
 
 
-%files -n ghc-%{name} -f ghc-%{name}.files
+%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
 %defattr(-,root,root,-)
 %doc LICENCE-LGPL
 
@@ -146,6 +151,12 @@
 
 
 %changelog
+* Mon Mar  2 2009 Jens Petersen <petersen at redhat.com> - 1.6-6
+- update to cabal2spec-0.12:
+  - add devel subpackage
+  - use global
+  - update archs
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild