[ghc-terminfo] update to 0.3.2.3 and cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Wed Jan 4 14:43:58 UTC 2012


commit 8da14c3dbb7214cdae1fb248cae8db5e80521eed
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jan 4 23:43:53 2012 +0900

    update to 0.3.2.3 and cabal2spec-0.25.2

 .gitignore        |    1 +
 ghc-terminfo.spec |   34 +++++++++++++++++++++++++---------
 sources           |    2 +-
 3 files changed, 27 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 390a5d4..6aab477 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /terminfo-0.3.1.3.tar.gz
 /terminfo-0.3.2.tar.gz
 /terminfo-0.3.2.2.tar.gz
+/terminfo-0.3.2.3.tar.gz
diff --git a/ghc-terminfo.spec b/ghc-terminfo.spec
index 126f524..1e2ea9a 100644
--- a/ghc-terminfo.spec
+++ b/ghc-terminfo.spec
@@ -1,3 +1,7 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name terminfo
 
 %global common_summary Haskell %{pkg_name} library
@@ -5,31 +9,29 @@
 %global common_description A %{pkg_name} library for Haskell.
 
 # add any foreign library dependencies here:
-%global ghc_pkg_c_deps ncurses-devel
+%global ghc_pkg_c_deps ncurses-devel%{?_isa}
 
 Name:           ghc-%{pkg_name}
-Version:        0.3.2.2
-Release:        1%{?dist}.3
+Version:        0.3.2.3
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
+# 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:  ncurses-devel%{?_isa}
 BuildRequires:  ghc-extensible-exceptions-prof
 
 %description
 %{common_description}
 
 
-%{?ghc_lib_package}
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -44,8 +46,22 @@ BuildRequires:  ghc-extensible-exceptions-prof
 # workaround libdir/libncursesw.so linker script breaking linking library for ghc < 7.2
 sed -i -e "s/extra-libraries: ncursesw/extra-libraries: tinfo/" -e "s!ld-options:!ld-options: /%{_lib}/libncursesw.so.5!" $RPM_BUILD_ROOT%{_libdir}/ghc-%{ghc_version}/package.conf.d/%{pkg_name}-%{version}.conf
 
+%ghc_devel_package
+Requires:  ncurses-devel%{?_isa}
+
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
+
+
+%ghc_files
+
 
 %changelog
+* Wed Jan  4 2012 Jens Petersen <petersen at redhat.com> - 0.3.2.3-1
+- update to 0.3.2.3 and cabal2spec-0.25.2
+
 * Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.3.2.2-1.3
 - rebuild with new gmp without compat lib
 
diff --git a/sources b/sources
index 7e8a569..7493f29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b93e47791354d25ce89fbbcd12a3c209  terminfo-0.3.2.2.tar.gz
+706f546c629ac100a402c9c2629c25fa  terminfo-0.3.2.3.tar.gz


More information about the scm-commits mailing list