[ghc-GLUT] update to cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Fri Jan 6 07:15:03 UTC 2012


commit a363b531f2fa049c8892887dcbb17e5bb51f93f0
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 6 16:14:58 2012 +0900

    update to cabal2spec-0.25.2

 ghc-GLUT.spec |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)
---
diff --git a/ghc-GLUT.spec b/ghc-GLUT.spec
index eb77529..7aa67b0 100644
--- a/ghc-GLUT.spec
+++ b/ghc-GLUT.spec
@@ -1,3 +1,7 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name GLUT
 
 %global common_summary Haskell %{pkg_name} library
@@ -5,24 +9,22 @@
 %global common_description The Haskell %{pkg_name} library.\
 This is a set of bindings to the C %{pkg_name} library.
 
-%global ghc_pkg_c_deps freeglut-devel
-
 Name:           ghc-%{pkg_name}
-# part of haskell-platform-2011.2.0.1
+# part of haskell-platform-2011.4.0.0
 Version:        2.1.2.1
-Release:        12%{?dist}.3
+Release:        13%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://www.haskell.org/haskellwiki/Opengl
+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
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
 BuildRequires:  ghc-OpenGL-prof
-%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
+BuildRequires:  freeglut-devel%{?_isa}
 Patch1:         ghc-GLUT-extralibs.patch
 
 %description
@@ -42,10 +44,22 @@ Patch1:         ghc-GLUT-extralibs.patch
 %ghc_lib_install
 
 
-%ghc_lib_package
+%ghc_devel_package
+Requires:  freeglut-devel%{?_isa}
+
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
+
+
+%ghc_files
 
 
 %changelog
+* Fri Jan  6 2012 Jens Petersen <petersen at redhat.com> - 2.1.2.1-13
+- update to cabal2spec-0.25.2
+
 * Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 2.1.2.1-12.3
 - rebuild with new gmp without compat lib
 


More information about the scm-commits mailing list