diff --git a/.gitignore b/.gitignore index 430fea3..e1a7015 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /split-0.1.2.3.tar.gz /split-0.1.3.tar.gz /split-0.1.4.tar.gz +/split-0.1.4.2.tar.gz diff --git a/ghc-split.spec b/ghc-split.spec index 515a7c2..3ecf689 100644 --- a/ghc-split.spec +++ b/ghc-split.spec @@ -1,6 +1,6 @@ -# For Haskell Packaging Guidelines see: -# - https://fedoraproject.org/wiki/Packaging:Haskell -# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell +# cabal2spec-0.25.2 +# https://fedoraproject.org/wiki/Packaging:Haskell +# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name split @@ -9,40 +9,25 @@ %global common_description Combinator library and utility functions for splitting lists. Name: ghc-%{pkg_name} -Version: 0.1.4 -Release: 1%{?dist}.2 +Version: 0.1.4.2 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD -# BEGIN: cabal2spec-0.24 +# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros -BuildRequires: hscolour -# END: cabal2spec-0.24 +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} +# END cabal2spec +BuildRequires: ghc-base-prof %description %{common_description} -%package -n ghc-%{pkg_name}-devel -Summary: Development files for %{common_summary} -Group: Development/Libraries -# BEGIN: cabal2spec-0.24 -%{?ghc_devel_requires} -Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release} -Provides: ghc-%{pkg_name}-prof = %{version}-%{release} -# END: cabal2spec-0.24 - -%description -n ghc-%{pkg_name}-devel -%{common_description} - -This package contains the development files. - - %prep %setup -q -n %{pkg_name}-%{version} @@ -55,24 +40,22 @@ This package contains the development files. %ghc_lib_install -%post -n ghc-%{pkg_name}-devel -%ghc_pkg_recache +%ghc_devel_package -%postun -n ghc-%{pkg_name}-devel -%ghc_pkg_recache +%ghc_devel_description -%if %{undefined ghc_without_shared} -%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files -%defattr(-,root,root,-) -%doc LICENSE README CHANGES -%endif +%ghc_devel_post_postun -%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files -%defattr(-,root,root,-) + +%ghc_files +%doc CHANGES %changelog +* Fri Jan 6 2012 Jens Petersen - 0.1.4.2-1 +- update to 0.1.4.2 and cabal2spec-0.25.2 + * Fri Oct 21 2011 Marcela Mašláňová - 0.1.4-1.2 - rebuild with new gmp without compat lib diff --git a/sources b/sources index f2e2835..a7fdc74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c376aef3a5a5401d013626ded90527ee split-0.1.4.tar.gz +491735eb5c962a14d8af493385805a2d split-0.1.4.2.tar.gz