[ghc-colour] move readme and changelog files into devel doc (#744635)

Jens Petersen petersen at fedoraproject.org
Thu Oct 13 03:44:39 UTC 2011


commit 4a2360fdca6fca5c4cc5992cdf0aee8c648436fe
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Oct 13 12:44:37 2011 +0900

    move readme and changelog files into devel doc (#744635)

 ghc-colour.spec |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/ghc-colour.spec b/ghc-colour.spec
index 69a9530..8cfd43f 100644
--- a/ghc-colour.spec
+++ b/ghc-colour.spec
@@ -13,19 +13,22 @@ color spaces are supported. A module of color names \
 
 Name:           ghc-%{pkg_name}
 Version:        2.3.1
-Release:        10%{?dist}.1
+Release:        11%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        MIT
-# BEGIN: cabal2spec-0.24
+# 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
-# END: cabal2spec-0.24
+%endif
+# END cabal2spec
+BuildRequires:  ghc-base-prof
 
 %description
 %{common_description}
@@ -34,11 +37,11 @@ BuildRequires:  hscolour
 %package -n ghc-%{pkg_name}-devel
 Summary:        Development files for %{common_summary}
 Group:          Development/Libraries
-# BEGIN: cabal2spec-0.24
+# BEGIN cabal2spec
 %{?ghc_devel_requires}
 Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
 Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
-# END: cabal2spec-0.24
+# END cabal2spec
 
 %description -n ghc-%{pkg_name}-devel
 %{common_description}
@@ -57,6 +60,8 @@ This package contains the development files.
 %install
 %ghc_lib_install
 
+rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{README,CHANGELOG}
+
 
 %post -n ghc-%{pkg_name}-devel
 %ghc_pkg_recache
@@ -67,15 +72,17 @@ This package contains the development files.
 
 %if %{undefined ghc_without_shared}
 %files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%defattr(-,root,root,-)
-%{_datadir}/%{pkg_name}-%{version}/
 %endif
 
 %files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
-%defattr(-,root,root,-)
+%doc README CHANGELOG
 
 
 %changelog
+* Thu Oct 13 2011 Jens Petersen <petersen at redhat.com> - 2.3.1-11
+- move readme and changelog files into devel doc (#744635)
+- BR base library
+
 * Tue Oct 11 2011 Peter Schiffer <pschiffe at redhat.com> - 2.3.1-10.1
 - rebuild with new gmp
 


More information about the scm-commits mailing list