[ghc-X11-xft] update to 0.3.1 and cabal2spec-0.24.1

Jens Petersen petersen at fedoraproject.org
Fri Dec 2 13:31:58 UTC 2011


commit 0b97c5dcfa5ecada9f74772e4a85a50306763805
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Dec 2 22:31:50 2011 +0900

    update to 0.3.1 and cabal2spec-0.24.1

 .gitignore       |    1 +
 ghc-X11-xft.spec |   46 ++++++++++++++++++++++++++++++++++++++++------
 sources          |    2 +-
 3 files changed, 42 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e628b6..699dda9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 X11-xft-0.3.tar.gz
+/X11-xft-0.3.1.tar.gz
diff --git a/ghc-X11-xft.spec b/ghc-X11-xft.spec
index 075876c..70afa8d 100644
--- a/ghc-X11-xft.spec
+++ b/ghc-X11-xft.spec
@@ -5,28 +5,46 @@
 %global common_description Haskell bindings to Xft, X Free Type interface library,\
 and some Xrender parts.
 
-%global ghc_pkg_c_deps libXft-devel
-
 Name:           ghc-%{pkg_name}
-Version:        0.3
-Release:        16%{?dist}.3
+Version:        0.3.1
+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
+%if %{undefined without_hscolour}
 BuildRequires:  hscolour
-%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
+%endif
+# END cabal2spec
+BuildRequires:  libXft-devel%{?_isa}
 BuildRequires:  ghc-X11-prof, ghc-utf8-string-prof, ghc-haskell98-prof
 
 %description
 %{common_description}
 
 
+%package -n ghc-%{pkg_name}-devel
+Summary:        Development files for %{common_summary}
+Group:          Development/Libraries
+# BEGIN cabal2spec
+%{?ghc_devel_requires}
+Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
+Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
+# END cabal2spec
+Requires:       libXft-devel%{?_isa}
+
+%description -n ghc-%{pkg_name}-devel
+%{common_description}
+
+This package contains the development files.
+
+
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -39,10 +57,26 @@ BuildRequires:  ghc-X11-prof, ghc-utf8-string-prof, ghc-haskell98-prof
 %ghc_lib_install
 
 
-%ghc_lib_package
+%post -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%postun -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%if %{undefined ghc_without_shared}
+%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
+%endif
+
+
+%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
 
 
 %changelog
+* Fri Dec  2 2011 Jens Petersen <petersen at redhat.com> - 0.3.1-1
+- update to 0.3.1 and cabal2spec-0.24.1
+
 * Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.3-16.3
 - rebuild with new gmp without compat lib
 
diff --git a/sources b/sources
index 38004c4..aa1ba8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b4a528a2a4fe5e9de715f6758ff9015  X11-xft-0.3.tar.gz
+ad885150a59f63de328e73abe5ffc79e  X11-xft-0.3.1.tar.gz


More information about the scm-commits mailing list