[ghc-tagged/el6] Revert to original f18 0.4.2.1-1

Jens Petersen petersen at fedoraproject.org
Mon Jul 8 01:02:59 UTC 2013


commit d1fe2289d1f376579b3fc0a97ccf32faea3c8201
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Jul 8 10:02:27 2013 +0900

    Revert to original f18 0.4.2.1-1

 .gitignore      |    2 -
 ghc-tagged.spec |   57 ++++++++++++++++++------------------------------------
 sources         |    2 +-
 3 files changed, 20 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fabe765..02b646b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,3 @@
 /tagged-0.4.1.tar.gz
 /tagged-0.4.2.tar.gz
 /tagged-0.4.2.1.tar.gz
-/tagged-0.4.4.tar.gz
-/tagged-0.6.tar.gz
diff --git a/ghc-tagged.spec b/ghc-tagged.spec
index 4d86f2d..692b6b4 100644
--- a/ghc-tagged.spec
+++ b/ghc-tagged.spec
@@ -1,32 +1,30 @@
+# cabal2spec-0.25.4
 # https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name tagged
 
+%global common_summary Newtype wrappers for phantom types
+
+%global common_description Newtype wrappers for phantom types to avoid unsafely passing dummy arguments.
+
 Name:           ghc-%{pkg_name}
-Version:        0.6
+Version:        0.4.2.1
 Release:        1%{?dist}
-Summary:        Newtype wrappers for phantom types
+Summary:        %{common_summary}
 
+Group:          System Environment/Libraries
 License:        BSD
+# 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:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
 
 %description
-Haskell 98 phantom types to avoid unsafely passing dummy arguments.
-
-
-%package devel
-Summary:        Haskell %{pkg_name} library development files
-Requires:       ghc-compiler = %{ghc_version}
-Requires(post): ghc-compiler = %{ghc_version}
-Requires(postun): ghc-compiler = %{ghc_version}
-Requires:       %{name} = %{version}-%{release}
-
-%description devel
-This package provides the Haskell %{pkg_name} library development files.
+%{common_description}
 
 
 %prep
@@ -41,36 +39,19 @@ This package provides the Haskell %{pkg_name} library development files.
 %ghc_lib_install
 
 
-%post devel
-%ghc_pkg_recache
+# devel subpackage
+%ghc_devel_package
 
+%ghc_devel_description
 
-%postun devel
-%ghc_pkg_recache
 
+%ghc_devel_post_postun
 
-%files -f %{name}.files
-%doc LICENSE
 
-
-%files devel -f %{name}-devel.files
-%doc README.markdown CHANGELOG.markdown
+%ghc_files LICENSE
 
 
 %changelog
-* Tue Jun 04 2013 Jens Petersen <petersen at redhat.com> - 0.6-1
-- update to 0.6
-- update to new simplified Haskell Packaging Guidelines
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Nov 08 2012 Jens Petersen <petersen at redhat.com> - 0.4.4-1
-- update to 0.4.4
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
 * Wed Jun 13 2012 Jens Petersen <petersen at redhat.com> - 0.4.2.1-1
 - update to 0.4.2.1
 
diff --git a/sources b/sources
index c4ebb6e..b24a41e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8f43a49e8c311083d0e1515872c8d48  tagged-0.6.tar.gz
+42d58bed61bf11466531bc26ecd42f2c  tagged-0.4.2.1.tar.gz


More information about the scm-commits mailing list