[ghc-gio] update to 0.12.2 and cabal2spec-0.25.2
Jens Petersen
petersen at fedoraproject.org
Fri Jan 6 13:08:54 UTC 2012
commit 0b6f2dfab27b899e55a4951e39db1425147a7bd2
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Jan 6 22:08:41 2012 +0900
update to 0.12.2 and cabal2spec-0.25.2
.gitignore | 1 +
ghc-gio.spec | 38 +++++++++++++++++++++++++++-----------
sources | 2 +-
3 files changed, 29 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fc825eb..a209fcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/gio-0.11.1.tar.gz
/gio-0.12.0.tar.gz
/gio-0.12.1.tar.gz
+/gio-0.12.2.tar.gz
diff --git a/ghc-gio.spec b/ghc-gio.spec
index a2c62af..ac59b4b 100644
--- a/ghc-gio.spec
+++ b/ghc-gio.spec
@@ -1,28 +1,32 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
%global pkg_name gio
%global common_summary Haskell %{pkg_name} library
%global common_description A %{pkg_name} binding for Haskell.
-# add any foreign library dependencies here:
-%global ghc_pkg_c_deps glib2-devel%{?_isa}
-
Name: ghc-%{pkg_name}
-Version: 0.12.1
-Release: 1%{?dist}.3
+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: glib2-devel%{?_isa}
BuildRequires: gtk2hs-buildtools
-BuildRequires: ghc-glib-prof, ghc-bytestring-prof, ghc-mtl-prof
+BuildRequires: ghc-glib-prof
+BuildRequires: ghc-bytestring-prof
+BuildRequires: ghc-mtl-prof
%description
%{common_description}
@@ -41,13 +45,24 @@ BuildRequires: ghc-glib-prof, ghc-bytestring-prof, ghc-mtl-prof
# demo files
rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}
-echo %doc demo >> %{name}-devel.files
+
+%ghc_devel_package
+Requires: glib2-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.2-1
+- update to 0.12.2 and 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
@@ -59,6 +74,7 @@ echo %doc demo >> %{name}-devel.files
* Tue Sep 20 2011 Jens Petersen <petersen at redhat.com> - 0.12.1-1
- update to 0.12.1
+- add _isa suffix to gtk2-devel depends (see #723558)
* Tue Jun 21 2011 Jens Petersen <petersen at redhat.com> - 0.12.0-5
- BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2)
diff --git a/sources b/sources
index 6728f9c..fd5f79f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbca486d68db02a91d8aca5f48d365ad gio-0.12.1.tar.gz
+248853f63f1053695d0a99f70c5d5deb gio-0.12.2.tar.gz
More information about the scm-commits
mailing list