rpms/ghc-HUnit/devel ghc-HUnit.spec,1.2,1.3
Jens Petersen
petersen at fedoraproject.org
Tue Dec 22 16:37:12 UTC 2009
Author: petersen
Update of /cvs/extras/rpms/ghc-HUnit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3395
Modified Files:
ghc-HUnit.spec
Log Message:
- update packaging for ghc-6.12.1
- added shared library support: needs ghc-rpm-macros 0.3.1
Index: ghc-HUnit.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-HUnit/devel/ghc-HUnit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-HUnit.spec 16 Sep 2009 09:28:50 -0000 1.2
+++ ghc-HUnit.spec 22 Dec 2009 16:37:11 -0000 1.3
@@ -2,6 +2,7 @@
%bcond_without doc
%bcond_without prof
+%bcond_without shared
# ghc does not emit debug information
%global debug_package %{nil}
@@ -9,18 +10,16 @@
Name: ghc-%{pkg_name}
# part of haskell-platform-2009.2.0.2 and ghc-6.10.x extralibs!
Version: 1.2.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Haskell %{pkg_name} library
-Group: Development/Libraries
+Group: System Environment/Libraries
License: BSD
URL: http://hunit.sourceforge.net/
Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha
-BuildRequires: ghc
-BuildRequires: ghc-rpm-macros
+BuildRequires: ghc, ghc-rpm-macros >= 0.3.1
%if %{with doc}
BuildRequires: ghc-doc
%endif
@@ -34,11 +33,14 @@ is a unit testing framework for Haskell,
for Java.
%package devel
-Summary: Haskell %{pkg_name} library
+Summary: Haskell %{pkg_name} library development files
Group: Development/Libraries
Requires: ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
+%if %{with shared}
+Requires: %{name} = %{version}-%{release}
+%endif
%description devel
This package contains the development files for %{name}
@@ -82,13 +84,12 @@ built for ghc-%{ghc_version}.
%if %{with doc}
%cabal haddock
%endif
-%ghc_gen_scripts
%install
-rm -rf $RPM_BUILD_ROOT
%cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
%ghc_gen_filelists %{name}
@@ -97,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
%post devel
-%ghc_register_pkg
+ghc-pkg recache
%if %{with doc}
@@ -106,10 +107,8 @@ rm -rf $RPM_BUILD_ROOT
%endif
-%preun devel
-if [ "$1" -eq 0 ] ; then
- %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
%if %{with doc}
@@ -120,9 +119,18 @@ fi
%endif
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
+%if %{without shared}
%{_docdir}/%{name}-%{version}
+%endif
%if %{with doc}
@@ -138,5 +146,9 @@ fi
%changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.2.0.3-2
+- update packaging for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+
* Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 1.2.0.3-1
- initial packaging for Fedora created by cabal2spec
More information about the fedora-extras-commits
mailing list