[ghc-pango] update to 0.12.2 and cabal2spec-0.25.2
Jens Petersen
petersen at fedoraproject.org
Fri Jan 6 13:23:10 UTC 2012
commit ebba1f53c5eab3776fae5ef1d905d3c749eec2a2
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Jan 6 22:23:04 2012 +0900
update to 0.12.2 and cabal2spec-0.25.2
.gitignore | 1 +
ghc-pango.spec | 42 +++++++++++++++++++++++++++---------------
sources | 2 +-
3 files changed, 29 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 297a65f..32b7406 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/pango-0.11.2.tar.gz
/pango-0.12.0.tar.gz
/pango-0.12.1.tar.gz
+/pango-0.12.2.tar.gz
diff --git a/ghc-pango.spec b/ghc-pango.spec
index 85017ec..1030b10 100644
--- a/ghc-pango.spec
+++ b/ghc-pango.spec
@@ -1,37 +1,33 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
%global pkg_name pango
%global common_summary Haskell %{pkg_name} library
%global common_description A Haskell binding to the Pango text-rendering library.
-# add any foreign library dependencies here:
-%global ghc_pkg_c_deps pango-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: ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
BuildRequires: gtk2hs-buildtools
-BuildRequires: hscolour
-%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
+BuildRequires: pango-devel%{?_isa}
BuildRequires: ghc-glib-prof, ghc-cairo-prof
%description
%{common_description}
-%if %{with shared}
-This package provides the shared library.
-%endif
-
-
-%{?ghc_lib_package}
%prep
@@ -47,10 +43,25 @@ This package provides the shared library.
# demo files
rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}
-echo %doc demo >> %{name}-devel.files
+
+
+%ghc_devel_package
+Requires: pango-devel%{?_isa}
+
+%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
+
* Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.12.1-1.3
- rebuild with new gmp without compat lib
@@ -62,6 +73,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 cec6e97..0067c55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9127d5b1dd5935ecdb0a5cc2d406f48 pango-0.12.1.tar.gz
+301efd2d2348698ce8d586ee14c36e2b pango-0.12.2.tar.gz
More information about the scm-commits
mailing list