[ghc-chalmers-lava2000/f16] Updated to 1.1.2
Shakthi Kannan
shakthimaan at fedoraproject.org
Thu Dec 29 10:25:15 UTC 2011
commit 6253d2c4b15ec8d9169596ea2d5617c09ec43ff9
Author: Shakthi Kannan <skannan at redhat.com>
Date: Thu Dec 29 15:50:19 2011 +0530
Updated to 1.1.2
.gitignore | 1 +
chalmers-lava2000-1.1.1-ghc7.patch | 12 ------
ghc-chalmers-lava2000.spec | 73 +++++++++++++++++++++++++++++++-----
sources | 2 +-
4 files changed, 65 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e84f35..0cb5854 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
chalmers-lava2000-1.1.1.tar.gz
+/chalmers-lava2000-1.1.2.tar.gz
diff --git a/ghc-chalmers-lava2000.spec b/ghc-chalmers-lava2000.spec
index 0c0d5b5..7c7ac33 100644
--- a/ghc-chalmers-lava2000.spec
+++ b/ghc-chalmers-lava2000.spec
@@ -1,47 +1,76 @@
+# For Haskell Packaging Guidelines see:
+# - https://fedoraproject.org/wiki/Packaging:Haskell
+# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
%global pkg_name chalmers-lava2000
-%global common_summary Haskell hardware description library
+# common part of summary for all the subpackages
+%global common_summary Haskell %{pkg_name} library
-%global common_description A Hardware description library for Haskell.
+# main description used for all the subpackages
+%global common_description A %{pkg_name} library for Haskell.
Name: ghc-%{pkg_name}
-Version: 1.1.1
-Release: 12%{?dist}
+Version: 1.1.2
+Release: 1%{?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
-
Source1: README.fedora
-Patch0: ghc-chalmers-lava2000-remove-verification-modules.patch
+Patch0: ghc-chalmers-lava2000-remove-verification-modules.patch
ExclusiveArch: %{ghc_arches}
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
+%if %{undefined without_hscolour}
BuildRequires: hscolour
-BuildRequires: ghc-haskell98-prof
-Patch1: chalmers-lava2000-1.1.1-ghc7.patch
+%endif
+# END cabal2spec
+# BR any C devel dependency here
+# list ghc-*-prof dependencies:
+BuildRequires: ghc
+
%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
+# 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}
%patch0 -p1 -b .orig
%{__install} -pm 644 %{SOURCE1} .
-%patch1 -p1 -b .base3
%build
+# define cabal_configure_options -f "opt1 -opt2 ..."
%ghc_lib_build
%install
%ghc_lib_install
+
# cleanup extra data files
echo "%{_datadir}/%{pkg_name}-%{version}" >> %{name}-devel.files
%{__mv} %{buildroot}%{_datadir}/%{pkg_name}-%{version}/Doc/tutorial.ps .
@@ -50,10 +79,33 @@ echo "%doc tutorial.ps.gz" >> %{name}-doc.files
%{__rm} -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{Doc,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
+* Thu Dec 29 2011 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> - 1.1.2-1
+- Updated to use cabal2spec-0.24.1.
+- Updated to 1.1.2.
+
+* Thu Oct 20 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1.1.1-12.2
+- rebuild with new gmp without compat lib
+
+* Tue Oct 11 2011 Peter Schiffer <pschiffe at redhat.com> - 1.1.1-12.1
+- rebuild with new gmp
+
* Fri Jun 24 2011 Jens Petersen <petersen at redhat.com> - 1.1.1-12
- BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2)
@@ -107,3 +159,4 @@ echo "%doc tutorial.ps.gz" >> %{name}-doc.files
* Thu Dec 10 2009 Shakthi Kannan <shakthimaan [AT] gmail dot com> - 1.0.2-1
- Set LAVADIR path with sed.
- Initial packaging for Fedora automatically generated by cabal2spec for 1.0.2
+
diff --git a/sources b/sources
index f7856e0..015616a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf8c388bd905a57221169b54a4b4454e chalmers-lava2000-1.1.1.tar.gz
+fbbeac9b5245572a3eddf70a7e98fc91 chalmers-lava2000-1.1.2.tar.gz
More information about the scm-commits
mailing list