From 50ca3dd51cb965a0699c75aef74848cf21fe7905 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:25 +0000 Subject: [PATCH 01/21] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a879091..567f1a3 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := ghc-fgl SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 07b2fd54625f7f00b5a2b2aae5f06b018eeec3c6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 25 Dec 2009 15:56:06 +0000 Subject: [PATCH 02/21] - update for ghc-6.12.1: add shared library support - use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0 - add common_summary and common_description --- ghc-fgl.spec | 83 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index 0756d82..07bf5b7 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -1,26 +1,29 @@ %global pkg_name fgl +%global common_summary Haskell Functional Graph Library + +%global common_description Martin Erwig's Functional Graph Library. + %bcond_without doc %bcond_without prof +%bcond_without shared # ghc does not emit debug information -%global debug_package %{nil} +#%%global debug_package %{nil} Name: ghc-%{pkg_name} # part of haskell-platform-2009.2.0.2 Version: 5.4.2.2 -Release: 1%{?dist} -Summary: Haskell %{pkg_name} library +Release: 2%{?dist} +Summary: %{common_summary} -Group: Development/Libraries +Group: System Environment/Libraries License: BSD URL: http://web.engr.oregonstate.edu/~erwig/fgl/haskell/ 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 -BuildRequires: ghc-rpm-macros +BuildRequires: ghc, ghc-rpm-macros >= 0.4.0 %if %{with doc} BuildRequires: ghc-doc %endif @@ -29,45 +32,46 @@ BuildRequires: ghc-prof %endif %description -This package provides the Haskell %{pkg_name} library for ghc. This -is a library of types and functions for addressing graph problems. +%{common_description} +%if %{with shared} +This package provides the shared library. +%endif %package devel -Summary: Haskell %{pkg_name} library +Summary: %{common_summary} development files Group: Development/Libraries -Requires: ghc = %{ghc_version} -Requires(post): ghc = %{ghc_version} -Requires(preun): ghc = %{ghc_version} +%{?ghc_requires} %description devel -This package contains the development files for %{name} -built for ghc-%{ghc_version}. +%{common_description} + +This package contains the development files. %if %{with doc} %package doc -Summary: Documentation for %{name} +Summary: Documentation for %{common_summary} Group: Development/Libraries -Requires: ghc-doc = %{ghc_version} -Requires(post): ghc-doc = %{ghc_version} -Requires(postun): ghc-doc = %{ghc_version} +%{?ghc_doc_requires} %description doc -This package contains development documentation files for the %{name} library. +%{common_description} + +This package contains development documentation files. %endif %if %{with prof} %package prof -Summary: Profiling libraries for %{name} +Summary: Profiling libraries for %{common_summary} Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: ghc-prof = %{ghc_version} +%{?ghc_prof_requires} %description prof -This package contains profiling libraries for %{name} -built for ghc-%{ghc_version}. +%{common_description} + +This package contains the profiling library. %endif @@ -81,13 +85,12 @@ built for ghc-%{ghc_version}. %if %{with doc} %cabal haddock %endif -%ghc_gen_scripts %install -rm -rf $RPM_BUILD_ROOT %cabal_install -%ghc_install_scripts +%cabal_pkg_conf + %ghc_gen_filelists %{name} @@ -96,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT %post devel -%ghc_register_pkg +ghc-pkg recache %if %{with doc} @@ -105,10 +108,8 @@ rm -rf $RPM_BUILD_ROOT %endif -%preun devel -if [ "$1" -eq 0 ] ; then - %ghc_unregister_pkg -fi +%postun devel +ghc-pkg recache %if %{with doc} @@ -119,9 +120,18 @@ fi %endif -%files devel -f %{name}-devel.files +%if %{with shared} +%files -f %{name}.files %defattr(-,root,root,-) %{_docdir}/%{name}-%{version} +%endif + + +%files devel -f %{name}-devel.files +%defattr(-,root,root,-) +%if %{without shared} +%{_docdir}/%{name}-%{version} +%endif %if %{with doc} @@ -137,5 +147,10 @@ fi %changelog +* Sat Dec 26 2009 Jens Petersen - 5.4.2.2-2 +- update for ghc-6.12.1: add shared library support +- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0 +- add common_summary and common_description + * Wed Aug 12 2009 Bryan O'Sullivan - 5.4.2.2-1 - initial packaging for Fedora created by cabal2spec From e563b19bb63b58ed7f00f216d5a7e401cf06d93d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 25 Dec 2009 16:21:57 +0000 Subject: [PATCH 03/21] buildrequires ghc-mtl --- ghc-fgl.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index 07bf5b7..e30a6b9 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -24,11 +24,14 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{versio # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-rpm-macros >= 0.4.0 +BuildRequires: ghc-mtl-devel %if %{with doc} BuildRequires: ghc-doc +BuildRequires: ghc-mtl-doc %endif %if %{with prof} BuildRequires: ghc-prof +BuildRequires: ghc-mtl-prof %endif %description @@ -42,6 +45,7 @@ This package provides the shared library. Summary: %{common_summary} development files Group: Development/Libraries %{?ghc_requires} +Requires: ghc-mtl-devel %description devel %{common_description} @@ -54,6 +58,7 @@ This package contains the development files. Summary: Documentation for %{common_summary} Group: Development/Libraries %{?ghc_doc_requires} +Requires: ghc-mtl-doc %description doc %{common_description} @@ -67,6 +72,7 @@ This package contains development documentation files. Summary: Profiling libraries for %{common_summary} Group: Development/Libraries %{?ghc_prof_requires} +Requires: ghc-mtl-prof %description prof %{common_description} @@ -151,6 +157,7 @@ fi - update for ghc-6.12.1: add shared library support - use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0 - add common_summary and common_description +- buildrequires ghc-mtl * Wed Aug 12 2009 Bryan O'Sullivan - 5.4.2.2-1 - initial packaging for Fedora created by cabal2spec From e2acd0d80977ed11f214dfdeed8ab241a15eabb3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 06:33:28 +0000 Subject: [PATCH 04/21] - update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: - drop doc and prof bcond - use common_summary and common_description - use ghc_lib_package and ghc_pkg_deps --- ghc-fgl.spec | 119 +++++++-------------------------------------------- 1 file changed, 16 insertions(+), 103 deletions(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index e30a6b9..0bf7a73 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -4,17 +4,17 @@ %global common_description Martin Erwig's Functional Graph Library. -%bcond_without doc -%bcond_without prof +%global ghc_pkg_deps ghc-mtl-devel + %bcond_without shared -# ghc does not emit debug information -#%%global debug_package %{nil} +# debuginfo is not useful for ghc +%global debug_package %{nil} Name: ghc-%{pkg_name} # part of haskell-platform-2009.2.0.2 Version: 5.4.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -23,16 +23,10 @@ URL: http://web.engr.oregonstate.edu/~erwig/fgl/haskell/ Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros >= 0.4.0 -BuildRequires: ghc-mtl-devel -%if %{with doc} +BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 BuildRequires: ghc-doc -BuildRequires: ghc-mtl-doc -%endif -%if %{with prof} BuildRequires: ghc-prof -BuildRequires: ghc-mtl-prof -%endif +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description %{common_description} @@ -41,44 +35,7 @@ This package provides the shared library. %endif -%package devel -Summary: %{common_summary} development files -Group: Development/Libraries -%{?ghc_requires} -Requires: ghc-mtl-devel - -%description devel -%{common_description} - -This package contains the development files. - - -%if %{with doc} -%package doc -Summary: Documentation for %{common_summary} -Group: Development/Libraries -%{?ghc_doc_requires} -Requires: ghc-mtl-doc - -%description doc -%{common_description} - -This package contains development documentation files. -%endif - - -%if %{with prof} -%package prof -Summary: Profiling libraries for %{common_summary} -Group: Development/Libraries -%{?ghc_prof_requires} -Requires: ghc-mtl-prof - -%description prof -%{common_description} - -This package contains the profiling library. -%endif +%ghc_lib_package %prep @@ -86,73 +43,29 @@ This package contains the profiling library. %build -%cabal_configure --ghc %{?with_prof:-p} +%cabal_configure --ghc -p %cabal build -%if %{with doc} %cabal haddock -%endif %install %cabal_install %cabal_pkg_conf -%ghc_gen_filelists %{name} +%ghc_gen_filelists %clean rm -rf $RPM_BUILD_ROOT -%post devel -ghc-pkg recache - - -%if %{with doc} -%post doc -%ghc_reindex_haddock -%endif - - -%postun devel -ghc-pkg recache - - -%if %{with doc} -%postun doc -if [ "$1" -eq 0 ] ; then - %ghc_reindex_haddock -fi -%endif - - -%if %{with shared} -%files -f %{name}.files -%defattr(-,root,root,-) -%{_docdir}/%{name}-%{version} -%endif - - -%files devel -f %{name}-devel.files -%defattr(-,root,root,-) -%if %{without shared} -%{_docdir}/%{name}-%{version} -%endif - - -%if %{with doc} -%files doc -f %{name}-doc.files -%defattr(-,root,root,-) -%endif - - -%if %{with prof} -%files prof -f %{name}-prof.files -%defattr(-,root,root,-) -%endif - - %changelog +* Mon Jan 11 2010 Jens Petersen - 5.4.2.2-3 +- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: +- drop doc and prof bcond +- use common_summary and common_description +- use ghc_lib_package and ghc_pkg_deps + * Sat Dec 26 2009 Jens Petersen - 5.4.2.2-2 - update for ghc-6.12.1: add shared library support - use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0 From 15d977750779753c5d0da3d5629058fc41934e65 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 14:59:34 +0000 Subject: [PATCH 05/21] rebuild against ghc-mtl package --- ghc-fgl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index 0bf7a73..c74313d 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -14,7 +14,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2009.2.0.2 Version: 5.4.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 12 2010 Jens Petersen - 5.4.2.2-4 +- rebuild against ghc-mtl package + * Mon Jan 11 2010 Jens Petersen - 5.4.2.2-3 - update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: - drop doc and prof bcond From 24109b1985648fc913bfbf5ec500afaddddb787e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Apr 2010 03:11:06 +0000 Subject: [PATCH 06/21] - part of haskell-platform-2010.1.0.0 - rebuild against ghc-6.12.2 - condition ghc_lib_package --- ghc-fgl.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index c74313d..6a2b3db 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -12,9 +12,9 @@ %global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform-2009.2.0.2 +# part of haskell-platform-2010.1.0.0 Version: 5.4.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -35,7 +35,7 @@ This package provides the shared library. %endif -%ghc_lib_package +%{?ghc_lib_package} %prep @@ -60,6 +60,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 27 2010 Jens Petersen - 5.4.2.2-5 +- part of haskell-platform-2010.1.0.0 +- rebuild against ghc-6.12.2 +- condition ghc_lib_package + * Tue Jan 12 2010 Jens Petersen - 5.4.2.2-4 - rebuild against ghc-mtl package From 8eed8d219011b28e571c5a4376753362c0d3a4fc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 25 Jun 2010 14:18:50 +0000 Subject: [PATCH 07/21] strip shared library (cabal2spec-0.21.4) --- ghc-fgl.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index 6a2b3db..5d946e1 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -14,18 +14,18 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2010.1.0.0 Version: 5.4.2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://web.engr.oregonstate.edu/~erwig/fgl/haskell/ 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-rpm-macros >= 0.5.1 -BuildRequires: ghc-doc -BuildRequires: ghc-prof +BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-rpm-macros >= 0.6.0 %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description @@ -49,10 +49,12 @@ This package provides the shared library. %install +rm -rf $RPM_BUILD_ROOT %cabal_install %cabal_pkg_conf %ghc_gen_filelists +%ghc_strip_dynlinked %clean @@ -60,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 26 2010 Jens Petersen - 5.4.2.2-6 +- strip shared library (cabal2spec-0.21.4) + * Tue Apr 27 2010 Jens Petersen - 5.4.2.2-5 - part of haskell-platform-2010.1.0.0 - rebuild against ghc-6.12.2 From 60bb72379ace9bf8899cafa470084624ffce5d8d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 16 Jul 2010 05:05:29 +0000 Subject: [PATCH 08/21] - update to 5.4.2.3 for haskell-platform-2010.2.0.0 - obsolete doc subpackage (ghc-rpm-macros-0.8.0) --- .cvsignore | 2 +- ghc-fgl.spec | 28 +++++++++++++--------------- sources | 2 +- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.cvsignore b/.cvsignore index fbb22b7..838f440 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fgl-5.4.2.2.tar.gz +fgl-5.4.2.3.tar.gz diff --git a/ghc-fgl.spec b/ghc-fgl.spec index 5d946e1..dd8d6a7 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -12,9 +12,9 @@ %global debug_package %{nil} Name: ghc-%{pkg_name} -# part of haskell-platform-2010.1.0.0 -Version: 5.4.2.2 -Release: 6%{?dist} +# part of haskell-platform-2010.2.0.0 +Version: 5.4.2.3 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -25,7 +25,7 @@ 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.6.0 +BuildRequires: ghc-rpm-macros >= 0.8.0 %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description @@ -35,33 +35,31 @@ This package provides the shared library. %endif -%{?ghc_lib_package} - - %prep %setup -q -n %{pkg_name}-%{version} %build -%cabal_configure --ghc -p -%cabal build -%cabal haddock +%ghc_lib_build %install rm -rf $RPM_BUILD_ROOT -%cabal_install -%cabal_pkg_conf - -%ghc_gen_filelists -%ghc_strip_dynlinked +%ghc_lib_install %clean rm -rf $RPM_BUILD_ROOT +%ghc_lib_package -o 5.4.2.3-1 + + %changelog +* Fri Jul 16 2010 Jens Petersen - 5.4.2.3-1 +- update to 5.4.2.3 for haskell-platform-2010.2.0.0 +- obsolete doc subpackage (ghc-rpm-macros-0.8.0) + * Sat Jun 26 2010 Jens Petersen - 5.4.2.2-6 - strip shared library (cabal2spec-0.21.4) diff --git a/sources b/sources index d9f692a..dd7b7dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad49ce31af04c0fd9c6dbfa52801ff83 fgl-5.4.2.2.tar.gz +29ccab8bebed16a8d7346c3ed52c5d9c fgl-5.4.2.3.tar.gz From 12aafc2ace3eac9e483be6ab855fcd844ae0d8cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:34:26 +0000 Subject: [PATCH 09/21] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 567f1a3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ghc-fgl -# $Id$ -NAME := ghc-fgl -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From ddad44865953173f8164402d5985634c0052d37f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Nov 2010 18:20:25 +1000 Subject: [PATCH 10/21] add hscolour, update url, drop -o obsoletes --- ghc-fgl.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index dd8d6a7..e7c4840 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -7,6 +7,7 @@ %global ghc_pkg_deps ghc-mtl-devel %bcond_without shared +%bcond_without hscolour # debuginfo is not useful for ghc %global debug_package %{nil} @@ -14,18 +15,21 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2010.2.0.0 Version: 5.4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD -URL: http://web.engr.oregonstate.edu/~erwig/fgl/haskell/ +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.8.0 +BuildRequires: ghc-rpm-macros >= 0.8.1 +%if %{with 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")} %description @@ -52,10 +56,14 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT -%ghc_lib_package -o 5.4.2.3-1 +%ghc_lib_package %changelog +* Thu Nov 25 2010 Jens Petersen - 5.4.2.3-2 +- add hscolour +- drop -o obsoletes + * Fri Jul 16 2010 Jens Petersen - 5.4.2.3-1 - update to 5.4.2.3 for haskell-platform-2010.2.0.0 - obsolete doc subpackage (ghc-rpm-macros-0.8.0) From 3ee29510328a52710db52b2266ec6b64bd0edb3c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 18 Jan 2011 18:36:19 +1000 Subject: [PATCH 11/21] update to cabal2spec-0.22.4 --- ghc-fgl.spec | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index e7c4840..76f5391 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -6,30 +6,24 @@ %global ghc_pkg_deps ghc-mtl-devel -%bcond_without shared -%bcond_without hscolour - # debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} # part of haskell-platform-2010.2.0.0 Version: 5.4.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD 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.8.1 -%if %{with hscolour} +BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour -%endif %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description @@ -48,18 +42,16 @@ This package provides the shared library. %install -rm -rf $RPM_BUILD_ROOT %ghc_lib_install -%clean -rm -rf $RPM_BUILD_ROOT - - %ghc_lib_package %changelog +* Tue Jan 18 2011 Jens Petersen - 5.4.2.3-3 +- update to cabal2spec-0.22.4 + * Thu Nov 25 2010 Jens Petersen - 5.4.2.3-2 - add hscolour - drop -o obsoletes From 852aaf03f551ad951e1eb5c830f98e44dec358d3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 19:11:16 -0600 Subject: [PATCH 12/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- ghc-fgl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index 76f5391..a579d04 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2010.2.0.0 Version: 5.4.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -49,6 +49,9 @@ This package provides the shared library. %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 5.4.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Jan 18 2011 Jens Petersen - 5.4.2.3-3 - update to cabal2spec-0.22.4 From 71e16799d2af73bce5345da4b6663990b56a324f Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Thu, 10 Mar 2011 09:15:38 +0100 Subject: [PATCH 13/21] Enable build on sparcv9 Signed-off-by: Fabio M. Di Nitto --- ghc-fgl.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index a579d04..1032094 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2010.2.0.0 Version: 5.4.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -20,7 +20,7 @@ License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 BuildRequires: ghc, ghc-doc, ghc-prof BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour @@ -49,6 +49,9 @@ This package provides the shared library. %changelog +* Thu Mar 10 2011 Fabio M. Di Nitto - 5.4.2.3-5 +- Enable build on sparcv9 + * Tue Feb 08 2011 Fedora Release Engineering - 5.4.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 6f06a3aaa69bff74997d7539b7c4bc27aabf109f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 27 May 2011 17:00:38 +0900 Subject: [PATCH 14/21] update to cabal2spec-0.23 --- ghc-fgl.spec | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index 1032094..3676f67 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -4,15 +4,10 @@ %global common_description Martin Erwig's Functional Graph Library. -%global ghc_pkg_deps ghc-mtl-devel - -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} -# part of haskell-platform-2010.2.0.0 +# part of haskell-platform-2011.2.0.0 Version: 5.4.2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -21,16 +16,13 @@ URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 -BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.3 +BuildRequires: ghc-prof +BuildRequires: ghc-rpm-macros BuildRequires: hscolour -%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +BuildRequires: ghc-mtl-prof %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif %prep @@ -49,6 +41,9 @@ This package provides the shared library. %changelog +* Fri May 27 2011 Jens Petersen - 5.4.2.3-6 +- update to cabal2spec-0.23 + * Thu Mar 10 2011 Fabio M. Di Nitto - 5.4.2.3-5 - Enable build on sparcv9 From dc123da4d841a219b1c6464f9b6d62438f4f05a6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 27 May 2011 17:05:48 +0900 Subject: [PATCH 15/21] forgot to add ppc64 --- ghc-fgl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index 3676f67..dd79341 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -15,7 +15,7 @@ License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 BuildRequires: ghc-prof BuildRequires: ghc-rpm-macros BuildRequires: hscolour From 5dd790f6992b24ec5055b17c13930390da0c8eda Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 20 Jun 2011 11:08:42 +0900 Subject: [PATCH 16/21] BR ghc-Cabal-devel and use ghc_excluded_archs --- ghc-fgl.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index dd79341..384079c 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -5,18 +5,18 @@ %global common_description Martin Erwig's Functional Graph Library. Name: ghc-%{pkg_name} -# part of haskell-platform-2011.2.0.0 +# part of haskell-platform-2011.2.0.1 Version: 5.4.2.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 -BuildRequires: ghc-prof +# ghc_excluded_archs is defined in redhat-rpm-config +ExcludeArch: %{ghc_excluded_archs} +BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour BuildRequires: ghc-mtl-prof @@ -41,6 +41,9 @@ BuildRequires: ghc-mtl-prof %changelog +* Mon Jun 20 2011 Jens Petersen - 5.4.2.3-7 +- BR ghc-Cabal-devel and use ghc_excluded_archs + * Fri May 27 2011 Jens Petersen - 5.4.2.3-6 - update to cabal2spec-0.23 From 21c3ca261116082248f239c11089f87171944f1d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 21 Jun 2011 17:24:53 +0900 Subject: [PATCH 17/21] ghc_arches replaces ghc_excluded_archs (cabal2spec-0.23.2) --- ghc-fgl.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index 384079c..2c3ec57 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -7,15 +7,14 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 5.4.2.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# ghc_excluded_archs is defined in redhat-rpm-config -ExcludeArch: %{ghc_excluded_archs} +ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour @@ -41,6 +40,9 @@ BuildRequires: ghc-mtl-prof %changelog +* Tue Jun 21 2011 Jens Petersen - 5.4.2.3-8 +- ghc_arches replaces ghc_excluded_archs + * Mon Jun 20 2011 Jens Petersen - 5.4.2.3-7 - BR ghc-Cabal-devel and use ghc_excluded_archs From b88add5fc95af3ad0a65a077bb56f4fc8240e0ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 11 Oct 2011 13:08:26 +0200 Subject: [PATCH 18/21] rebuild with new gmp --- ghc-fgl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index 2c3ec57..a5cbb04 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 5.4.2.3 -Release: 8%{?dist} +Release: 8%{?dist}.1 Summary: %{common_summary} Group: System Environment/Libraries @@ -40,6 +40,9 @@ BuildRequires: ghc-mtl-prof %changelog +* Tue Oct 11 2011 Peter Schiffer - 5.4.2.3-8.1 +- rebuild with new gmp + * Tue Jun 21 2011 Jens Petersen - 5.4.2.3-8 - ghc_arches replaces ghc_excluded_archs From fd6e40afcb033ffb145a4f03e9433049fd6a6fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Thu, 20 Oct 2011 23:01:55 +0200 Subject: [PATCH 19/21] rebuild with new gmp without compat lib --- ghc-fgl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index a5cbb04..cbc2abc 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 5.4.2.3 -Release: 8%{?dist}.1 +Release: 8%{?dist}.2 Summary: %{common_summary} Group: System Environment/Libraries @@ -40,6 +40,9 @@ BuildRequires: ghc-mtl-prof %changelog +* Thu Oct 20 2011 Marcela Mašláňová - 5.4.2.3-8.2 +- rebuild with new gmp without compat lib + * Tue Oct 11 2011 Peter Schiffer - 5.4.2.3-8.1 - rebuild with new gmp From cf4507806dfe15351ea5538619c30172ab621be3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 19 Dec 2011 10:53:06 +0900 Subject: [PATCH 20/21] update to 5.4.2.4 for haskell-platform-2011.4 --- .gitignore | 1 + ghc-fgl.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 838f440..e8c5bdf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ fgl-5.4.2.3.tar.gz +/fgl-5.4.2.4.tar.gz diff --git a/ghc-fgl.spec b/ghc-fgl.spec index cbc2abc..0fa7f1c 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -5,19 +5,20 @@ %global common_description Martin Erwig's Functional Graph Library. Name: ghc-%{pkg_name} -# part of haskell-platform-2011.2.0.1 -Version: 5.4.2.3 -Release: 8%{?dist}.2 +# part of haskell-platform-2011.4.0.0 +Version: 5.4.2.4 +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 ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros -BuildRequires: hscolour +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} +# END cabal2spec BuildRequires: ghc-mtl-prof %description @@ -40,6 +41,9 @@ BuildRequires: ghc-mtl-prof %changelog +* Mon Dec 19 2011 Jens Petersen - 5.4.2.4-1 +- update to 5.4.2.4 for haskell-platform-2011.4 + * Thu Oct 20 2011 Marcela Mašláňová - 5.4.2.3-8.2 - rebuild with new gmp without compat lib diff --git a/sources b/sources index dd7b7dd..eb830f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29ccab8bebed16a8d7346c3ed52c5d9c fgl-5.4.2.3.tar.gz +6b5430f4a5ad374bc4351acaf3d81e4f fgl-5.4.2.4.tar.gz From 3cf9223126a12b45aaf54f49ef1b3d666c1882ca Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 21:22:51 -0600 Subject: [PATCH 21/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- ghc-fgl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-fgl.spec b/ghc-fgl.spec index 0fa7f1c..b53c440 100644 --- a/ghc-fgl.spec +++ b/ghc-fgl.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.4.0.0 Version: 5.4.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -41,6 +41,9 @@ BuildRequires: ghc-mtl-prof %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 5.4.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Dec 19 2011 Jens Petersen - 5.4.2.4-1 - update to 5.4.2.4 for haskell-platform-2011.4