[ghc-gtk] update to 0.12.2 and cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Fri Jan 6 13:37:51 UTC 2012


commit 276bd5d13ece400dae3f5f0d92dcfa2f4a948d07
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 6 22:37:45 2012 +0900

    update to 0.12.2 and cabal2spec-0.25.2

 .gitignore   |    1 +
 ghc-gtk.spec |   44 +++++++++++++++++++++++++++++++-------------
 sources      |    2 +-
 3 files changed, 33 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7482a2..22b7e74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /gtk-0.11.2.tar.gz
 /gtk-0.12.0.tar.gz
 /gtk-0.12.1.tar.gz
+/gtk-0.12.2.tar.gz
diff --git a/ghc-gtk.spec b/ghc-gtk.spec
index f50cc45..20eeba7 100644
--- a/ghc-gtk.spec
+++ b/ghc-gtk.spec
@@ -1,30 +1,34 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name gtk
 
 %global common_summary Haskell %{pkg_name} library
 
 %global common_description A %{pkg_name} library for Haskell.
 
-%global ghc_pkg_c_deps gtk2-devel%{?_isa}
-
-# obsolete old gtk2hs packages
-%global ghc_pkg_obsoletes ghc-gtkglext-devel < 0.11, ghc-soegtk-devel < 0.11, ghc-vte-devel < 0.11
-
 Name:           ghc-%{pkg_name}
-Version:        0.12.1
-Release:        1%{?dist}.2
+Version:        0.12.2
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
+# 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
-%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
+BuildRequires:  gtk2-devel%{?_isa}
 BuildRequires:  gtk2hs-buildtools
-BuildRequires:  ghc-glib-prof, ghc-pango-prof, ghc-cairo-prof, ghc-gio-prof, ghc-mtl-prof
+BuildRequires:  ghc-cairo-prof
+BuildRequires:  ghc-gio-prof
+BuildRequires:  ghc-glib-prof
+BuildRequires:  ghc-mtl-prof
+BuildRequires:  ghc-pango-prof
 
 %description
 %{common_description}
@@ -43,13 +47,27 @@ BuildRequires:  ghc-glib-prof, ghc-pango-prof, ghc-cairo-prof, ghc-gio-prof, ghc
 
 # move demos
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}
-echo %doc demo >> %{name}-devel.files
 
 
-%ghc_lib_package
+%ghc_devel_package
+Requires:  gtk2-devel%{?_isa}
+Obsoletes: ghc-gtkglext-devel < 0.11, ghc-soegtk-devel < 0.11, ghc-vte-devel < 0.11
+Obsoletes: ghc-gtkglext-prof < 0.11, ghc-soegtk-prof < 0.11, ghc-vte-prof < 0.11
+
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
+
+
+%ghc_files
+%doc demo
 
 
 %changelog
+* Fri Jan  6 2012 Jens Petersen <petersen at redhat.com> - 0.12.2-1
+- update to 0.12.2 and cabal2spec-0.25.2
+
 * Thu Oct 20 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.12.1-1.2
 - rebuild with new gmp without compat lib
 
diff --git a/sources b/sources
index 8a2fb57..5658113 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57b9432ea8d4d7ef3b96f0c19f805ed8  gtk-0.12.1.tar.gz
+a80d6f2ab90c673059270f2dd83c4686  gtk-0.12.2.tar.gz


More information about the scm-commits mailing list