[ghc-X11] update to 1.5.0.1 and cabal2spec-0.25.2
Jens Petersen
petersen at fedoraproject.org
Thu Jan 5 00:31:22 UTC 2012
commit b08b98e94450cf007fdb3519a6ff6d21aeddafab
Author: Jens Petersen <petersen at redhat.com>
Date: Thu Jan 5 09:31:08 2012 +0900
update to 1.5.0.1 and cabal2spec-0.25.2
.gitignore | 1 +
ghc-X11.spec | 50 +++++++++++++++++---------------------------------
sources | 2 +-
3 files changed, 19 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e919278..662ac93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
X11-1.5.0.0.tar.gz
+/X11-1.5.0.1.tar.gz
diff --git a/ghc-X11.spec b/ghc-X11.spec
index 39d20c7..2acd9a0 100644
--- a/ghc-X11.spec
+++ b/ghc-X11.spec
@@ -1,3 +1,7 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
%global pkg_name X11
%global common_summary Haskell %{pkg_name} library
@@ -8,8 +12,8 @@ Manual", available online at <http://tronche.com/gui/x/xlib/>.
Name: ghc-%{pkg_name}
-Version: 1.5.0.0
-Release: 13%{?dist}
+Version: 1.5.0.1
+Release: 1%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
@@ -19,35 +23,17 @@ 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
-%endif
+BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour}
# END cabal2spec
-BuildRequires: libXinerama-devel%{?_isa}, libX11-devel%{?_isa}, libXext-devel%{?_isa}
+BuildRequires: libXinerama-devel%{?_isa}
+BuildRequires: libX11-devel%{?_isa}
+BuildRequires: libXext-devel%{?_isa}
BuildRequires: ghc-syb-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: libXinerama-devel%{?_isa}, libX11-devel%{?_isa}, libXext-devel%{?_isa}
-# Haskell devel dependencies are autogenerated by ghc-deps.sh
-
-%description -n ghc-%{pkg_name}-devel
-%{common_description}
-
-This package contains the development files.
-
-
%prep
%setup -q -n %{pkg_name}-%{version}
@@ -60,23 +46,21 @@ This package contains the development files.
%ghc_lib_install
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_package
+%ghc_devel_description
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_post_postun
-%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
+%ghc_files
%changelog
+* Thu Jan 5 2012 Jens Petersen <petersen at redhat.com> - 1.5.0.1-1
+- update to 1.5.0.1 and cabal2spec-0.25.2
+
* Fri Dec 2 2011 Jens Petersen <petersen at redhat.com> - 1.5.0.0-13
- use _isa and update to cabal2spec-0.24.1
diff --git a/sources b/sources
index 9baeb3d..1a98cce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec6670f5ce1812206903c8a0fd9df04c X11-1.5.0.0.tar.gz
+7d69b204f773a0335828ced0e1e069f2 X11-1.5.0.1.tar.gz
More information about the scm-commits
mailing list