[cpphs] update to 1.13.2 and cabal2spec-0.24.1; use ghc_exclude_docdir
Jens Petersen
petersen at fedoraproject.org
Sat Oct 15 04:05:43 UTC 2011
commit 7bd4a59e9397690cb2617ae2497ba7bcfaffdbe4
Author: Jens Petersen <petersen at redhat.com>
Date: Sat Oct 15 13:04:47 2011 +0900
update to 1.13.2 and cabal2spec-0.24.1; use ghc_exclude_docdir
.gitignore | 1 +
cpphs.spec | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
sources | 2 +-
3 files changed, 69 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a6104bb..5e3adf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
cpphs-1.11.tar.gz
/cpphs-1.12.tar.gz
/cpphs-1.13.1.tar.gz
+/cpphs-1.13.2.tar.gz
diff --git a/cpphs.spec b/cpphs.spec
index 7306d00..7f201c0 100644
--- a/cpphs.spec
+++ b/cpphs.spec
@@ -11,8 +11,10 @@ compatible with traditional (K&R) pre-processors. Additional features\
include: a plain-text mode; an option to unlit literate code files; and\
an option to turn off macro-expansion.
+%global ghc_exclude_docdir 1
+
Name: %{pkg_name}
-Version: 1.13.1
+Version: 1.13.2
Release: 1%{?dist}
Summary: C pre-processor for Haskell
Group: Development/Languages
@@ -22,7 +24,7 @@ URL: http://hackage.haskell.org/package/%{name}
Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
ExclusiveArch: %{ghc_arches}
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros
+BuildRequires: ghc-rpm-macros >= 0.13.12
%if %{undefined without_hscolour}
BuildRequires: hscolour
%endif
@@ -32,6 +34,43 @@ BuildRequires: ghc-haskell98-prof
%description
%{common_description}
+
+%if %{undefined ghc_without_shared}
+%package -n ghc-%{pkg_name}
+Summary: Development files for %{common_summary}
+Group: Development/Libraries
+License: LGPLv2+
+# BEGIN cabal2spec
+%{?ghc_devel_requires}
+Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release}
+Provides: ghc-%{pkg_name}-prof = %{version}-%{release}
+# END cabal2spec
+
+%description -n ghc-%{pkg_name}
+%{common_description}
+
+This package contains the shared library.
+%endif
+
+
+%package -n ghc-%{pkg_name}-devel
+Summary: Development files for %{common_summary}
+Group: Development/Libraries
+License: LGPLv2+
+# BEGIN cabal2spec
+%{?ghc_devel_requires}
+Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release}
+Provides: ghc-%{pkg_name}-prof = %{version}-%{release}
+# END cabal2spec
+# 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
@@ -42,18 +81,41 @@ BuildRequires: ghc-haskell98-prof
%install
%ghc_lib_install
+rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENCE-LGPL
+
+
+
+%post -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%postun -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
%files
-%defattr(-,root,root,-)
-#%doc LICENCE-GPL
+%doc LICENCE-GPL
%{_bindir}/%{name}
-%ghc_binlib_package -l LGPLv2+
+%if %{undefined ghc_without_shared}
+%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
+%doc LICENCE-LGPL
+%endif
+
+
+%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+%if %{defined ghc_without_shared}
+%doc LICENCE-LGPL
+%endif
%changelog
+* Sat Oct 15 2011 Jens Petersen <petersen at redhat.com> - 1.13.2-1
+- update to 1.13.2
+- update to cabal2spec-0.24.1
+- use ghc_exclude_docdir from ghc-rpm-macros-0.13.12
+
* Fri Oct 14 2011 Jens Petersen <petersen at redhat.com> - 1.13.1-1
- update to 1.13.1
diff --git a/sources b/sources
index bb32c87..975e82c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fe8b5c71068e97602b0f45facd76be3 cpphs-1.13.1.tar.gz
+9dac7e4731f9f568b61437fdc014a007 cpphs-1.13.2.tar.gz
More information about the scm-commits
mailing list