[ghc-safe] update to 0.3.3 and cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Fri Jan 6 02:52:27 UTC 2012


commit 8a7bcb37e03ff7e101a5caaf9fd3d334972c361f
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 6 11:52:21 2012 +0900

    update to 0.3.3 and cabal2spec-0.25.2

 .gitignore    |    1 +
 ghc-safe.spec |   51 +++++++++++++++++----------------------------------
 sources       |    2 +-
 3 files changed, 19 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2955ad0..85dea93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /safe-0.3.tar.gz
+/safe-0.3.3.tar.gz
diff --git a/ghc-safe.spec b/ghc-safe.spec
index 2226b09..9efb431 100644
--- a/ghc-safe.spec
+++ b/ghc-safe.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 safe
 
@@ -13,40 +13,25 @@ and default values. These functions can be used to reduce the \
 number of unsafe pattern matches in your code.
 
 Name:           ghc-%{pkg_name}
-Version:        0.3
-Release:        5%{?dist}.2
+Version:        0.3.3
+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}
 
@@ -59,23 +44,21 @@ This package contains the development files.
 %ghc_lib_install
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_package
+
+%ghc_devel_description
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
 
+%ghc_devel_post_postun
 
-%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,-)
+%ghc_files
 
 
 %changelog
+* Fri Jan  6 2012 Jens Petersen <petersen at redhat.com> - 0.3.3-1
+- update to 0.3.3 and cabal2spec-0.25.2
+
 * Fri Oct 21 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.3-5.2
 - rebuild with new gmp without compat lib
 
diff --git a/sources b/sources
index 53d7169..e8fef98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc409bdcd76775cf587b12b525ac09c5  safe-0.3.tar.gz
+5df09a74ef9ce6d98c7fd7f97a9eb73e  safe-0.3.3.tar.gz


More information about the scm-commits mailing list