[ghc-feldspar-language/f15] Updated to upstream 0.4.0.2.

Shakthi Kannan shakthimaan at fedoraproject.org
Mon Jan 23 11:35:41 UTC 2012


commit 5c18c6a20d00f67ae7910f22842cf3dfe048a8ea
Author: Shakthi Kannan <skannan at redhat.com>
Date:   Mon Jan 23 17:00:40 2012 +0530

    Updated to upstream 0.4.0.2.

 .gitignore                     |    1 +
 feldspar-language-0.3.1.tar.gz |  Bin 44019 -> 0 bytes
 ghc-feldspar-language.spec     |   96 +++++++++++++++++++++++++++-------------
 sources                        |    2 +-
 4 files changed, 67 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..ac6b908 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/feldspar-language-0.4.0.2.tar.gz
diff --git a/ghc-feldspar-language.spec b/ghc-feldspar-language.spec
index 75ece50..f553774 100644
--- a/ghc-feldspar-language.spec
+++ b/ghc-feldspar-language.spec
@@ -1,49 +1,59 @@
+# For Haskell Packaging Guidelines see:
+# - https://fedoraproject.org/wiki/Packaging:Haskell
+# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name feldspar-language
 
+# common part of summary for all the subpackages
 %global common_summary Haskell %{pkg_name} library
 
+# main description used for all the subpackages
 %global common_description A %{pkg_name} library for Haskell.
 
-# add any Haskell library dependencies here:
-%global ghc_pkg_deps ghc-QuickCheck-devel ghc-mtl-devel
-
-%bcond_without shared
-%bcond_without hscolour
-
-# debuginfo is not useful for ghc
-%global debug_package %{nil}
-
 Name:           ghc-%{pkg_name}
-Version:        0.3.1
-# 0.3.2 and 0.3.3 need QuickCheck >= 2.3 which breaks current haskell-platform
-
-Release:        4%{?dist}
+Version:        0.4.0.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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.7.0
-
-
-%if %{with hscolour}
+ExclusiveArch:  %{ghc_arches}
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros
+%if %{undefined without_hscolour}
 BuildRequires:  hscolour
 %endif
-%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
+# END cabal2spec
+# BR any C devel dependency here
+# list ghc-*-prof dependencies:
+BuildRequires:  ghc-QuickCheck ghc-QuickCheck-devel ghc-QuickCheck-prof
+BuildRequires:  ghc-random ghc-random-devel ghc
+BuildRequires:  ghc-mtl ghc-mtl-devel ghc-mtl-prof
+BuildRequires:  ghc-tagged ghc-tagged-devel
+BuildRequires:  ghc-type-level-devel ghc-type-level-prof
 
 %description
 %{common_description}
-%if %{with shared}
-This package provides the shared library.
-%endif
 
 
-%{?ghc_lib_package}
+%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
@@ -51,24 +61,48 @@ This package provides the shared library.
 
 
 %build
-LANG=en_US.UTF8
+# define cabal_configure_options -f "opt1 -opt2 ..."
 %ghc_lib_build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 
 # cleanup extra data files
-echo "%{_datadir}/%{pkg_name}-%{version}" >> %{name}-devel.files
+##echo "%{_datadir}/%{pkg_name}-%{version}" >> %{name}-devel.files
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%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> - 0.4.0.2-1
+- Updated spec file using cabal2spec-0.24.1.
+- Updated to 0.4.0.2 sources.
+
+* Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.3.1-4.3
+- rebuild with new gmp without compat lib
+
+* Thu Oct 20 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.3.1-4.2
+- rebuild with new gmp without compat lib
+
+* Tue Oct 11 2011 Peter Schiffer <pschiffe at redhat.com> - 0.3.1-4.1
+- rebuild with new gmp
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index cc2a969..820e4c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4dc9ae8be2f0d20c8ba4d1b765250349  feldspar-language-0.3.1.tar.gz
+dc6a9f65a4851113a2cd39eef19d07d9  feldspar-language-0.4.0.2.tar.gz


More information about the scm-commits mailing list