From dcbccc7cc45128a9c3e3511ef375b3336c91edae0b013ca248df04eecd19104b Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Thu, 26 Jun 2014 07:34:27 +0000 Subject: [PATCH 1/2] Accepting request 238733 from home:e9925248:branches:devel:languages:haskell Fix x86_64 / i586 detection for SLES11 OBS-URL: https://build.opensuse.org/request/show/238733 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=29 --- ghc-rpm-macros.changes | 5 +++++ ghc-rpm-macros.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index c330752..c68ce9e 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 26 06:52:11 UTC 2014 - martin.koegler@chello.at + +- SLES11 does not support a different BuildArch for subpackages + ------------------------------------------------------------------- Thu May 29 19:39:26 UTC 2014 - peter.trommler@ohm-hochschule.de diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 97dac83..eaa3198 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -84,7 +84,9 @@ for example in ghc and haskell-platform. %package -n ghc-srpm-macros Summary: RPM macros for building Haskell source packages Group: Development/Libraries/Other +%if 0%{?suse_version} > 1110 BuildArch: noarch +%endif %description -n ghc-srpm-macros Macros used when generating source Haskell rpm packages. From f20820a5a49272048bd969eb78e50cd7465da8e20f87f977e69e2e52374aa3ef Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Thu, 26 Jun 2014 11:18:14 +0000 Subject: [PATCH 2/2] - add rpmlintrc to spec file OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=30 --- ghc-rpm-macros.changes | 5 +++++ ghc-rpm-macros.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index c68ce9e..7f2c9ad 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 26 11:17:24 UTC 2014 - peter.trommler@ohm-hochschule.de + +- add rpmlintrc to spec file + ------------------------------------------------------------------- Thu Jun 26 06:52:11 UTC 2014 - martin.koegler@chello.at diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index eaa3198..316b588 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -32,6 +32,7 @@ Group: Development/Libraries/Other Url: https://fedoraproject.org/wiki/Haskell_SIG Source0: http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}-%{git_hash}.tar.xz +Source1: rpmlintrc # 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-OPENSUSE add-group.patch sbahling@suse.com -- Make sure a Group: tag is generated in subpackages; peter.trommler@ohm-hochschule.de: also puts libraries in System/Libraries, see package group guidelines