diff --git a/.gitignore b/.gitignore index 00faa36..78c09be 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /cmdargs-0.6.7.tar.gz /cmdargs-0.6.8.tar.gz /cmdargs-0.7.tar.gz +/cmdargs-0.8.tar.gz diff --git a/ghc-cmdargs.spec b/ghc-cmdargs.spec index 451bb68..7faeca7 100644 --- a/ghc-cmdargs.spec +++ b/ghc-cmdargs.spec @@ -10,22 +10,23 @@ parsers. Name: ghc-%{pkg_name} -Version: 0.7 -Release: 4%{?dist} +Version: 0.8 +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 +%if %{undefined without_hscolour} BuildRequires: hscolour -# END: cabal2spec-0.24 - -BuildRequires: ghc-transformers-devel +%endif +# END cabal2spec +BuildRequires: ghc-transformers-prof %description %{common_description} @@ -34,11 +35,11 @@ BuildRequires: ghc-transformers-devel %package -n ghc-%{pkg_name}-devel Summary: Development files for %{common_summary} Group: Development/Libraries -# BEGIN: cabal2spec-0.24 +# BEGIN cabal2spec %{?ghc_devel_requires} Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release} Provides: ghc-%{pkg_name}-prof = %{version}-%{release} -# END: cabal2spec-0.24 +# END cabal2spec %description -n ghc-%{pkg_name}-devel %{common_description} @@ -69,14 +70,15 @@ rm -vf %{buildroot}/%{_bindir}/%{pkg_name} %if %{undefined ghc_without_shared} %files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files -%defattr(-,root,root,-) %endif %files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files -%defattr(-,root,root,-) %changelog +* Mon Oct 3 2011 Jens Petersen - 0.8-1 +- update to 0.8 and cabal2spec-0.24.1 + * Sat Jul 09 2011 Ben Boeckel - 0.7-4 - Update to cabal2spec-0.24 diff --git a/sources b/sources index 1477e29..0283cc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c66db11ecaaae3aad7ebebe7ba5aa54d cmdargs-0.7.tar.gz +7d147d53d170c86683243690c154a1e7 cmdargs-0.8.tar.gz