From c3a4cd89703ad3fbf709514164f9a99a8fb3cf7aff3411a0f8dbc8e2d696db8b Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Thu, 26 Sep 2013 07:01:11 +0000 Subject: [PATCH 1/3] - clean up spec file * fix comment for patch 1 (wrong file name) * remove unused patch2 in setup section - enable colorized documentation for all Haskell packages OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=16 --- ghc-rpm-macros.changes | 12 ++++++++++++ ghc-rpm-macros.spec | 5 ++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index 09b04fd..0522687 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 06:59:33 UTC 2013 - peter.trommler@ohm-hochschule.de + +- clean up spec file +* fix comment for patch 1 (wrong file name) +* remove unused patch2 in setup section + +------------------------------------------------------------------- +Thu Sep 26 06:56:57 UTC 2013 - peter.trommler@ohm-hochschule.de + +- enable colorized documentation for all Haskell packages + ------------------------------------------------------------------- Thu Aug 1 15:18:38 UTC 2013 - dvaleev@suse.com diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 0e10c14..49fff3c 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -20,7 +20,7 @@ %global macros_dir %{_sysconfdir}/rpm -%global without_hscolour 1 +#%%global without_hscolour 1 Name: ghc-rpm-macros Version: 0.99 @@ -35,7 +35,7 @@ Source0: http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}- Source4: macros.ghc-suse # PATCH-FIX-OPENSUSE buildService .patch peter.trommler@ohm-hochschule.de -- openSUSE packaging Haskell guidelines Patch: buildService.patch -# PATCH-FIX-OPENSUSE cabal-rpm-spdx.patch peter.trommler@ohm-hochschule.de -- openSUSE way to disable debug packages +# PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch peter.trommler@ohm-hochschule.de -- openSUSE way to disable debug packages Patch1: suse-disable-debug-packages.patch # PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.trommler@ohm-hochschule.de -- SLE's RPM is too old in 11 SP1 and SP2 Patch100: sle-sp1-rpmdeps.patch @@ -64,7 +64,6 @@ Set of macros to build ghc packages that contain multiple subpackages. %setup -q -n %{name}-%{git_hash} %patch -p1 -b .obs %patch1 -p1 -b .debug -#%%patch2 -p1 -b .filelists %if 0%{?sles_version} %patch -P 100 -p1 %endif From c5dbbc49f376347c8ca87ec505fc971b4ccf3e766ae881ceff8ff1ff6c287f42 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Fri, 27 Sep 2013 15:09:01 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=17 --- ghc-rpm-macros.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 49fff3c..1837981 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -20,7 +20,7 @@ %global macros_dir %{_sysconfdir}/rpm -#%%global without_hscolour 1 +%global without_hscolour 1 Name: ghc-rpm-macros Version: 0.99 From eb132aac1b9eefb01d51a8a3cb13dee5ddfe50d1ab76d07860614739a0398193 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sun, 29 Sep 2013 17:23:34 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/ghc-rpm-macros revision 7.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=4b0ed5a2d43b92b74c53f11da5050a0a --- ghc-rpm-macros.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 1837981..49fff3c 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -20,7 +20,7 @@ %global macros_dir %{_sysconfdir}/rpm -%global without_hscolour 1 +#%%global without_hscolour 1 Name: ghc-rpm-macros Version: 0.99