From 86b1b51525b23db283978c2db95832d326d34e63c1701f9dd79d2bfacb430ce2 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sun, 14 Dec 2014 09:35:34 +0000 Subject: [PATCH] Accepting request 265136 from devel:languages:haskell:platform enable Haskell shared libraries on ppc OBS-URL: https://build.opensuse.org/request/show/265136 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=38 --- ghc-rpm-macros-rpmlintrc | 1 - ghc-rpm-macros.changes | 11 +++++++++++ ghc-rpm-macros.spec | 14 +------------- 3 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 ghc-rpm-macros-rpmlintrc diff --git a/ghc-rpm-macros-rpmlintrc b/ghc-rpm-macros-rpmlintrc deleted file mode 100644 index b63b405..0000000 --- a/ghc-rpm-macros-rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter("no-binary") diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index 7627c26..cfc77e5 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Dec 14 09:26:31 UTC 2014 - peter.trommler@ohm-hochschule.de + +- make package noarch and remove rpmlintrc + +------------------------------------------------------------------- +Sat Dec 13 09:33:54 UTC 2014 - peter.trommler@ohm-hochschule.de + +- do not disable dynamic libraries on ppc anymore +* fixed by patch 18 in ghc.spec + ------------------------------------------------------------------- Tue Oct 21 15:05:27 UTC 2014 - peter.trommler@ohm-hochschule.de diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 118620a..7abf006 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -25,6 +25,7 @@ Name: ghc-rpm-macros Version: 1.3.6 Release: 0 +BuildArch: noarch Summary: RPM Macros for building packages for GHC License: GPL-3.0+ Group: Development/Libraries/Other @@ -32,7 +33,6 @@ 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: ghc-rpm-macros-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 @@ -110,18 +110,6 @@ install -p -D -m 0644 ghc.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.att install -p -D -m 0755 cabal-tweak-dep-ver %{buildroot}/%{_bindir}/cabal-tweak-dep-ver install -p -D -m 0755 cabal-tweak-flag %{buildroot}/%{_bindir}/cabal-tweak-flag -# this is why this package is (still) arch-dependent: -# turn off shared libs and dynamic linking on ppc -# See Haskell trac #8024 -%ifarch ppc -cat >> %{buildroot}%{macros_dir}/macros.ghc <