[ghc-hslogger] update to cabal2spec-0.25.2
Jens Petersen
petersen at fedoraproject.org
Wed Jan 4 14:59:04 UTC 2012
commit f9fe2bfedd123549f54806278f23215824d72ff8
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Jan 4 23:58:59 2012 +0900
update to cabal2spec-0.25.2
ghc-hslogger.spec | 49 +++++++++++++++++--------------------------------
1 files changed, 17 insertions(+), 32 deletions(-)
---
diff --git a/ghc-hslogger.spec b/ghc-hslogger.spec
index adf9e7d..9ba3342 100644
--- a/ghc-hslogger.spec
+++ b/ghc-hslogger.spec
@@ -1,3 +1,7 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
%global pkg_name hslogger
%global common_summary Haskell logging library
@@ -10,40 +14,25 @@ It also has a syslog handler built in.
Name: ghc-%{pkg_name}
Version: 1.1.5
-Release: 1%{?dist}.4
+Release: 2%{?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
-BuildRequires: ghc-network-prof, ghc-time-prof
+BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
+BuildRequires: ghc-network-prof
+BuildRequires: ghc-time-prof
%description
%{common_description}
-%package -n ghc-%{pkg_name}-devel
-Summary: Development files for %{common_summary}
-Group: Development/Libraries
-# BEGIN: cabal2spec-0.24
-%{?ghc_devel_requires}
-Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release}
-Provides: ghc-%{pkg_name}-prof = %{version}-%{release}
-# END: cabal2spec-0.24
-# remember to require any C devel dependency here
-# 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}
@@ -56,25 +45,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
-%defattr(-,root,root,-)
-%endif
-
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
-%defattr(-,root,root,-)
+%ghc_files
%changelog
+* Wed Jan 4 2012 Jens Petersen <petersen at redhat.com> - 1.1.5-2
+- update to cabal2spec-0.25.2
+
* Sun Jan 01 2012 Bruno Wolff III <bruno at wolff.to> - 1.1.5-1.4
- Rebuild for libHSnetwork update so that test hegdewars can be built
More information about the scm-commits
mailing list