[ghc-OpenGL] update to cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Fri Jan 6 08:40:33 UTC 2012


commit e9c03c898745a8d2ca656147efa79821d14e42d0
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 6 17:40:26 2012 +0900

    update to cabal2spec-0.25.2

 ghc-OpenGL.spec |   48 ++++++++++++++++--------------------------------
 1 files changed, 16 insertions(+), 32 deletions(-)
---
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec
index 0f5c080..ed81e8b 100644
--- a/ghc-OpenGL.spec
+++ b/ghc-OpenGL.spec
@@ -1,3 +1,7 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name OpenGL
 
 %global common_summary Haskell %{pkg_name} library
@@ -5,9 +9,9 @@
 %global common_description Haskell bindings to the OpenGL graphics library.
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform-2011.2.0.1
+# part of haskell-platform-2011.4.0.0
 Version:        2.2.3.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -17,10 +21,7 @@ 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
-%endif
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
 # END cabal2spec
 BuildRequires:  ghc-base-prof
 BuildRequires:  mesa-libGL-devel
@@ -30,23 +31,6 @@ BuildRequires:  mesa-libGLU-devel
 %{common_description}
 
 
-%package -n ghc-%{pkg_name}-devel
-Summary:        Development files for %{common_summary}
-Group:          Development/Libraries
-# BEGIN cabal2spec
-%{?ghc_devel_requires}
-Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
-Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
-# END cabal2spec
-Requires:       mesa-libGL-devel%{?_isa}
-Requires:       mesa-libGLU-devel%{?_isa}
-
-%description -n ghc-%{pkg_name}-devel
-%{common_description}
-
-This package contains the development files.
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -59,23 +43,23 @@ This package contains the development files.
 %ghc_lib_install
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
-
+%ghc_devel_package
+Requires:       mesa-libGL-devel%{?_isa}
+Requires:       mesa-libGLU-devel%{?_isa}
 
-%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
-%endif
+%ghc_devel_post_postun
 
 
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+%ghc_files
 
 
 %changelog
+* Fri Jan  6 2012 Jens Petersen <petersen at redhat.com> - 2.2.3.0-12
+- update to cabal2spec-0.25.2
+
 * Fri Nov 11 2011 Jens Petersen <petersen at redhat.com> - 2.2.3.0-11
 - update to cabal2spec-0.24.1
 - append _isa to mesa-libGL*-devel requires


More information about the scm-commits mailing list