[ghc-glade] update to cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Fri Jan 6 14:12:21 UTC 2012


commit 15b98699d0dc1095206740187d84df9ef292f367
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 6 23:12:15 2012 +0900

    update to cabal2spec-0.25.2

 ghc-glade.spec |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/ghc-glade.spec b/ghc-glade.spec
index 99b436d..30012f6 100644
--- a/ghc-glade.spec
+++ b/ghc-glade.spec
@@ -1,25 +1,28 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name glade
 
 %global common_summary Haskell %{pkg_name} library
 
 %global common_description A %{pkg_name} library binding for Haskell.
 
-%global ghc_pkg_c_deps libglade2-devel%{?_isa}
-
 Name:           ghc-%{pkg_name}
 Version:        0.12.1
-Release:        1%{?dist}.3
+Release:        2%{?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:  libglade2-devel%{?_isa}
 BuildRequires:  gtk2hs-buildtools
 BuildRequires:  ghc-gtk-prof
 
@@ -40,13 +43,24 @@ BuildRequires:  ghc-gtk-prof
 
 # move demos
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}
-echo %doc demo >> %{name}-devel.files
+
+%ghc_devel_package
+Requires:  libglade2-devel%{?_isa}
+
+%ghc_devel_description
 
 
-%ghc_lib_package
+%ghc_devel_post_postun
+
+
+%ghc_files
+%doc demo
 
 
 %changelog
+* Fri Jan  6 2012 Jens Petersen <petersen at redhat.com> - 0.12.1-2
+- update to cabal2spec-0.25.2
+
 * Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.12.1-1.3
 - rebuild with new gmp without compat lib
 


More information about the scm-commits mailing list