From 84796ad801822c98b2cfffebfd2e0ecb7509aa33 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 17 Nov 2009 04:35:54 +0000 Subject: [PATCH 01/13] - update to 0.9 - use %ghc_pkg_ver for dep requires versions --- ghc-xmonad-contrib.spec | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index 52e8840..f8f7c1e 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -7,8 +7,8 @@ %global debug_package %{nil} Name: ghc-%{pkg_name} -Version: 0.8.1 -Release: 8%{?dist} +Version: 0.9 +Release: 1%{?dist} Summary: Third party extensions for xmonad Group: Development/Libraries @@ -26,6 +26,7 @@ BuildRequires: ghc, ghc-rpm-macros BuildRequires: ghc-doc BuildRequires: ghc-utf8-string-doc BuildRequires: ghc-X11-xft-doc +BuildRequires: ghc-xmonad-doc %endif %if %{with prof} BuildRequires: ghc-prof @@ -56,9 +57,9 @@ Group: Development/Libraries Requires: ghc = %{ghc_version} Requires(post): ghc = %{ghc_version} Requires(preun): ghc = %{ghc_version} -Requires: ghc-xmonad-devel -Requires: ghc-utf8-string-devel -Requires: ghc-X11-xft-devel +Requires: ghc-xmonad-devel = %ghc_pkg_ver xmonad +Requires: ghc-utf8-string-devel = %ghc_pkg_ver utf8-string +Requires: ghc-X11-xft-devel = %ghc_pkg_ver X11-xft %description devel This package contains the development files for %{name} @@ -72,10 +73,9 @@ Group: Development/Libraries Requires: ghc-doc = %{ghc_version} Requires(post): ghc-doc = %{ghc_version} Requires(postun): ghc-doc = %{ghc_version} -Requires: ghc-xmonad-doc -Requires: ghc-utf8-string-doc -Requires: ghc-X11-xft-doc -BuildRequires: ghc-xmonad-doc +Requires: ghc-xmonad-doc = %ghc_pkg_ver xmonad +Requires: ghc-utf8-string-doc = %ghc_pkg_ver utf8-string +Requires: ghc-X11-xft-doc = %ghc_pkg_ver X11-xft %description doc This package contains development documentation files for the %{name} library. @@ -88,9 +88,9 @@ Summary: Profiling libraries for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: ghc-prof = %{ghc_version} -Requires: ghc-xmonad-prof -Requires: ghc-utf8-string-prof -Requires: ghc-X11-xft-prof +Requires: ghc-xmonad-prof = %ghc_pkg_ver xmonad +Requires: ghc-utf8-string-prof = %ghc_pkg_ver utf8-string +Requires: ghc-X11-xft-prof = %ghc_pkg_ver X11-xft %description prof This package contains profiling libraries for %{name} @@ -164,6 +164,10 @@ fi %changelog +* Tue Nov 17 2009 Jens Petersen - 0.9-1 +- update to 0.9 +- use %%ghc_pkg_ver for dep requires versions + * Fri Aug 28 2009 Yaakov M. Nemoy - 0.8.1-8 - added a few more docs From 789743d2fed9dfee73885b3f2957a39f2d757d46 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 17 Nov 2009 05:34:53 +0000 Subject: [PATCH 02/13] add 0.9 tarball --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8a07cbe..b75c855 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xmonad-contrib-0.8.1.tar.gz +xmonad-contrib-0.9.tar.gz diff --git a/sources b/sources index b3b4159..2283970 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03f74fda270aca759407787da73e50d9 xmonad-contrib-0.8.1.tar.gz +545485c8ec417de9e1c36975c17656d4 xmonad-contrib-0.9.tar.gz From 3d9ee652ff433a0806184809c2217db22efbdc2a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:25 +0000 Subject: [PATCH 03/13] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e493074..466d093 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: ghc-xmonad-contrib -# $Id$ +# $Id: Makefile,v 1.1 2009/09/22 16:36:10 kevin Exp $ NAME := ghc-xmonad-contrib 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 0538bb880cca6e49412112547ce9bdc713b70700 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 09:55:13 +0000 Subject: [PATCH 04/13] - update to 0.9.1 - 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 - build shared library - drop redundant buildroot and its install cleaning --- ghc-xmonad-contrib.spec | 167 ++++++++++------------------------------ 1 file changed, 40 insertions(+), 127 deletions(-) diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index f8f7c1e..a5c37ed 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -1,101 +1,49 @@ %global pkg_name xmonad-contrib -%bcond_without doc -%bcond_without prof +%global common_summary Third party extensions for xmonad -# ghc does not emit debug information +%global common_description Third party tiling algorithms, configurations and scripts to xmonad,\ +a tiling window manager for X.\ +\ +For an introduction to building, configuring and using xmonad\ +extensions, see "XMonad.Doc". In particular:\ +\ +"XMonad.Doc.Configuring", a guide to configuring xmonad\ +"XMonad.Doc.Extending", using the contributed extensions library\ +"XMonad.Doc.Developing", introduction to xmonad internals and writing\ +your own extensions. + +%global ghc_pkg_deps ghc-utf8-string-devel, ghc-X11-xft-devel, ghc-xmonad-devel + +%bcond_without shared + +# debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} -Version: 0.9 +Version: 0.9.1 Release: 1%{?dist} -Summary: Third party extensions for xmonad +Summary: %{common_summary} -Group: Development/Libraries -License: BSD3 +Group: System Environment/Libraries +License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/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-xmonad-devel = %{version} -BuildRequires: ghc-utf8-string-devel -BuildRequires: ghc-X11-xft-devel -BuildRequires: ghc, ghc-rpm-macros -%if %{with doc} +BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 BuildRequires: ghc-doc -BuildRequires: ghc-utf8-string-doc -BuildRequires: ghc-X11-xft-doc -BuildRequires: ghc-xmonad-doc -%endif -%if %{with prof} BuildRequires: ghc-prof -BuildRequires: ghc-xmonad-prof = %{version} -BuildRequires: ghc-utf8-string-prof -BuildRequires: ghc-X11-xft-prof -%endif +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description -Haskell %{pkg_name} library for ghc-%{ghc_version}. - -Third party tiling algorithms, configurations and scripts to xmonad, -a tiling window manager for X. - -For an introduction to building, configuring and using xmonad -extensions, see "XMonad.Doc". In particular: - -"XMonad.Doc.Configuring", a guide to configuring xmonad - -"XMonad.Doc.Extending", using the contributed extensions library - -"XMonad.Doc.Developing", introduction to xmonad internals and writing -your own extensions. - -%package devel -Summary: Haskell %{pkg_name} library -Group: Development/Libraries -Requires: ghc = %{ghc_version} -Requires(post): ghc = %{ghc_version} -Requires(preun): ghc = %{ghc_version} -Requires: ghc-xmonad-devel = %ghc_pkg_ver xmonad -Requires: ghc-utf8-string-devel = %ghc_pkg_ver utf8-string -Requires: ghc-X11-xft-devel = %ghc_pkg_ver X11-xft - -%description devel -This package contains the development files for %{name} -built for ghc-%{ghc_version}. - - -%if %{with doc} -%package doc -Summary: Documentation for %{name} -Group: Development/Libraries -Requires: ghc-doc = %{ghc_version} -Requires(post): ghc-doc = %{ghc_version} -Requires(postun): ghc-doc = %{ghc_version} -Requires: ghc-xmonad-doc = %ghc_pkg_ver xmonad -Requires: ghc-utf8-string-doc = %ghc_pkg_ver utf8-string -Requires: ghc-X11-xft-doc = %ghc_pkg_ver X11-xft - -%description doc -This package contains development documentation files for the %{name} library. +%{common_description} +%if %{with shared} +This package provides the shared library. %endif -%if %{with prof} -%package prof -Summary: Profiling libraries for %{name} -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: ghc-prof = %{ghc_version} -Requires: ghc-xmonad-prof = %ghc_pkg_ver xmonad -Requires: ghc-utf8-string-prof = %ghc_pkg_ver utf8-string -Requires: ghc-X11-xft-prof = %ghc_pkg_ver X11-xft - -%description prof -This package contains profiling libraries for %{name} -built for ghc-%{ghc_version}. -%endif +%ghc_lib_package %prep @@ -103,67 +51,32 @@ built for ghc-%{ghc_version}. %build -%cabal_configure --ghc %{?with_prof:-p} +%cabal_configure --ghc -p %cabal build -%if %{with doc} %cabal haddock -%endif -%ghc_gen_scripts %install -rm -rf $RPM_BUILD_ROOT %cabal_install -%ghc_install_scripts -%ghc_gen_filelists %{name} +%cabal_pkg_conf + +%ghc_gen_filelists %clean rm -rf $RPM_BUILD_ROOT -%post devel -%ghc_register_pkg - - -%if %{with doc} -%post doc -%ghc_reindex_haddock -%endif - - -%preun devel -if [ "$1" -eq 0 ] ; then - %ghc_unregister_pkg -fi - - -%if %{with doc} -%postun doc -if [ "$1" -eq 0 ] ; then - %ghc_reindex_haddock -fi -%endif - - -%files devel -f %{name}-devel.files -%defattr(-,root,root,-) -%{_docdir}/%{name}-%{version} - - -%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 - 0.9.1-1 +- update to 0.9.1 +- 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 +- build shared library +- drop redundant buildroot and its install cleaning + * Tue Nov 17 2009 Jens Petersen - 0.9-1 - update to 0.9 - use %%ghc_pkg_ver for dep requires versions From a8c1f42ece46b937e2a70ddd84a24b10eb98ba0f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 09:56:06 +0000 Subject: [PATCH 05/13] 0.9.1 src --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index b75c855..6cc9254 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xmonad-contrib-0.9.tar.gz +xmonad-contrib-0.9.1.tar.gz diff --git a/sources b/sources index 2283970..701e752 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -545485c8ec417de9e1c36975c17656d4 xmonad-contrib-0.9.tar.gz +09a6e5173878d43b9f3ddd13b3ec955b xmonad-contrib-0.9.1.tar.gz From e8a99c994eb50719520d34c28a8d7ac652afe9a3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 13 Jan 2010 02:13:18 +0000 Subject: [PATCH 06/13] rebuild against ghc-mtl package --- ghc-xmonad-contrib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index a5c37ed..2cd971d 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -22,7 +22,7 @@ your own extensions. Name: ghc-%{pkg_name} Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 13 2010 Jens Petersen - 0.9.1-2 +- rebuild against ghc-mtl package + * Mon Jan 11 2010 Jens Petersen - 0.9.1-1 - update to 0.9.1 - update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: From 990fe1e77c6344d24147a606ee630c1ae231c4da Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 15 Jan 2010 04:35:03 +0000 Subject: [PATCH 07/13] utf8-string is part of ghc so drop ghc-utf8-string-devel dependency --- ghc-xmonad-contrib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index 2cd971d..31a397e 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -13,7 +13,7 @@ extensions, see "XMonad.Doc". In particular:\ "XMonad.Doc.Developing", introduction to xmonad internals and writing\ your own extensions. -%global ghc_pkg_deps ghc-utf8-string-devel, ghc-X11-xft-devel, ghc-xmonad-devel +%global ghc_pkg_deps ghc-X11-xft-devel, ghc-xmonad-devel %bcond_without shared @@ -22,7 +22,7 @@ your own extensions. Name: ghc-%{pkg_name} Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 15 2010 Jens Petersen - 0.9.1-3 +- utf8-string is part of ghc so drop ghc-utf8-string-devel dependency + * Wed Jan 13 2010 Jens Petersen - 0.9.1-2 - rebuild against ghc-mtl package From 911704f22f0d4092dd321dc519ba86d96932363b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 29 Apr 2010 02:40:26 +0000 Subject: [PATCH 08/13] - rebuild against ghc-6.12.2 - condition ghc_lib_package - depend on utf8-string again --- ghc-xmonad-contrib.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index 31a397e..5e37f7e 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -13,7 +13,7 @@ extensions, see "XMonad.Doc". In particular:\ "XMonad.Doc.Developing", introduction to xmonad internals and writing\ your own extensions. -%global ghc_pkg_deps ghc-X11-xft-devel, ghc-xmonad-devel +%global ghc_pkg_deps ghc-X11-xft-devel, ghc-utf8-string-devel, ghc-xmonad-devel %bcond_without shared @@ -22,7 +22,7 @@ your own extensions. Name: ghc-%{pkg_name} Version: 0.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -43,7 +43,7 @@ This package provides the shared library. %endif -%ghc_lib_package +%{?ghc_lib_package} %prep @@ -68,6 +68,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 29 2010 Jens Petersen - 0.9.1-4 +- rebuild against ghc-6.12.2 +- condition ghc_lib_package +- depend on utf8-string again + * Fri Jan 15 2010 Jens Petersen - 0.9.1-3 - utf8-string is part of ghc so drop ghc-utf8-string-devel dependency From 32b8616ed0e0d59afa5b0f1f8143111ab8d7bba5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 26 Jun 2010 09:40:41 +0000 Subject: [PATCH 09/13] sync cabal2spec-0.22 --- ghc-xmonad-contrib.spec | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index 5e37f7e..46d32dc 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -22,18 +22,18 @@ your own extensions. Name: ghc-%{pkg_name} Version: 0.9.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/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-rpm-macros >= 0.5.1 -BuildRequires: ghc-doc -BuildRequires: ghc-prof +BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-rpm-macros >= 0.7.0 %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description @@ -51,16 +51,12 @@ This package provides the shared library. %build -%cabal_configure --ghc -p -%cabal build -%cabal haddock +%ghc_lib_build %install -%cabal_install -%cabal_pkg_conf - -%ghc_gen_filelists +rm -rf $RPM_BUILD_ROOT +%ghc_lib_install %clean @@ -68,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 26 2010 Jens Petersen - 0.9.1-5 +- sync cabal2spec-0.22 + * Thu Apr 29 2010 Jens Petersen - 0.9.1-4 - rebuild against ghc-6.12.2 - condition ghc_lib_package From 486d67f113fd63bfbf84fdcbb86008f9d24c6da4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:35:06 +0000 Subject: [PATCH 10/13] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log 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 466d093..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ghc-xmonad-contrib -# $Id: Makefile,v 1.1 2009/09/22 16:36:10 kevin Exp $ -NAME := ghc-xmonad-contrib -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) diff --git a/import.log b/import.log deleted file mode 100644 index 41c8bdb..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -ghc-xmonad-contrib-0_8_1-8_fc11:HEAD:ghc-xmonad-contrib-0.8.1-8.fc11.src.rpm:1253827158 From 26fd54b929a66360e2aa3155d7e9c5eecfb6fccc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 4 Sep 2010 22:49:07 +1000 Subject: [PATCH 11/13] ghc-rpm-macros-0.8.1: add hscolour and doc obsolete (cabal2spec-0.22.2) --- ghc-xmonad-contrib.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index 46d32dc..201b9ae 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -16,13 +16,14 @@ your own extensions. %global ghc_pkg_deps ghc-X11-xft-devel, ghc-utf8-string-devel, ghc-xmonad-devel %bcond_without shared +%bcond_without hscolour # debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} Version: 0.9.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -33,7 +34,10 @@ 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 +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 @@ -43,9 +47,6 @@ This package provides the shared library. %endif -%{?ghc_lib_package} - - %prep %setup -q -n %{pkg_name}-%{version} @@ -63,7 +64,13 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT +%ghc_lib_package -o 0.9.1-6 + + %changelog +* Sat Sep 4 2010 Jens Petersen - 0.9.1-6 +- add hscolour and doc obsolete (cabal2spec-0.22.2) + * Sat Jun 26 2010 Jens Petersen - 0.9.1-5 - sync cabal2spec-0.22 From 4a7a9387b7ccaf86e9bfb4c17ce2a6b77a932d4b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 14 Sep 2010 16:45:22 +1000 Subject: [PATCH 12/13] rebuild against patched xmonad --- ghc-xmonad-contrib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index 201b9ae..0fdefa9 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -23,7 +23,7 @@ your own extensions. Name: ghc-%{pkg_name} Version: 0.9.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 14 2010 Jens Petersen - 0.9.1-7 +- rebuild against patched xmonad + * Sat Sep 4 2010 Jens Petersen - 0.9.1-6 - add hscolour and doc obsolete (cabal2spec-0.22.2) From b35a91ac2ada204c6fb614a7ee1f0df9d222614d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 14:16:20 -0700 Subject: [PATCH 13/13] - Rebuilt for gcc bug 634757 --- ghc-xmonad-contrib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index 0fdefa9..32bc10c 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -23,7 +23,7 @@ your own extensions. Name: ghc-%{pkg_name} Version: 0.9.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 29 2010 jkeating - 0.9.1-8 +- Rebuilt for gcc bug 634757 + * Tue Sep 14 2010 Jens Petersen - 0.9.1-7 - rebuild against patched xmonad