forked from pool/ghc-rpm-macros
Accepting request 233459 from devel:languages:haskell:platform
update to 1.2.7 and fix for ppc64le OBS-URL: https://build.opensuse.org/request/show/233459 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=25
This commit is contained in:
Peter Trommler
Git OBS Bridge
parent
6c97b6c250
commit
d7fac43954
3
_service
3
_service
@ -1,3 +0,0 @@
|
||||
<services>
|
||||
|
||||
<service name="download_files" mode="localonly"/></services>
|
||||
@ -1,7 +1,7 @@
|
||||
Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra
|
||||
Index: ghc-rpm-macros-48199c851a2c672494e295b3cbfc4eded20c3a11/ghc-rpm-macros.ghc-extra
|
||||
===================================================================
|
||||
--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc-extra
|
||||
+++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra
|
||||
--- ghc-rpm-macros-48199c851a2c672494e295b3cbfc4eded20c3a11.orig/ghc-rpm-macros.ghc-extra
|
||||
+++ ghc-rpm-macros-48199c851a2c672494e295b3cbfc4eded20c3a11/ghc-rpm-macros.ghc-extra
|
||||
@@ -9,6 +9,7 @@
|
||||
%define basepkg ghc-%{pkgname}\
|
||||
%package -n %{basepkg}\
|
||||
@ -9,8 +9,8 @@ Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.gh
|
||||
+Group: System/Libraries\
|
||||
%{?1:Version: %{pkgver}}\
|
||||
%{-l:License: %{-l*}}\
|
||||
%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")}\
|
||||
@@ -18,6 +19,7 @@ This package provides the Haskell %{pkgn
|
||||
Url: http://hackage.haskell.org/package/%{pkgname}\
|
||||
@@ -19,6 +20,7 @@ This package provides the Haskell %{pkgn
|
||||
\
|
||||
%package -n %{basepkg}-devel\
|
||||
Summary: Haskell %{pkgname} library development files\
|
||||
|
||||
20
disable-execstack.patch
Normal file
20
disable-execstack.patch
Normal file
@ -0,0 +1,20 @@
|
||||
Index: ghc-rpm-macros-48199c851a2c672494e295b3cbfc4eded20c3a11/ghc-rpm-macros.ghc
|
||||
===================================================================
|
||||
--- ghc-rpm-macros-48199c851a2c672494e295b3cbfc4eded20c3a11.orig/ghc-rpm-macros.ghc
|
||||
+++ ghc-rpm-macros-48199c851a2c672494e295b3cbfc4eded20c3a11/ghc-rpm-macros.ghc
|
||||
@@ -130,7 +130,6 @@ fi
|
||||
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
|
||||
%cabal_install\
|
||||
%{!?1:%ghc_strip_dynlinked}\
|
||||
-%{!?1:%ghc_clear_execstack}\
|
||||
%{nil}
|
||||
|
||||
# ghc_lib_install [name] [version]
|
||||
@@ -142,7 +141,6 @@ fi
|
||||
%cabal_pkg_conf\
|
||||
%ghc_gen_filelists\
|
||||
%{!?1:%ghc_strip_dynlinked}\
|
||||
-%{!?1:%ghc_clear_execstack}\
|
||||
%{nil}
|
||||
|
||||
# ghc_fix_dynamic_rpath prog ...
|
||||
@ -1,8 +1,8 @@
|
||||
Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra
|
||||
Index: ghc-rpm-macros-48199c851a2c672494e295b3cbfc4eded20c3a11/ghc-rpm-macros.ghc-extra
|
||||
===================================================================
|
||||
--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc-extra
|
||||
+++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra
|
||||
@@ -39,8 +39,10 @@ This package provides the Haskell %{pkgn
|
||||
--- ghc-rpm-macros-48199c851a2c672494e295b3cbfc4eded20c3a11.orig/ghc-rpm-macros.ghc-extra
|
||||
+++ ghc-rpm-macros-48199c851a2c672494e295b3cbfc4eded20c3a11/ghc-rpm-macros.ghc-extra
|
||||
@@ -40,8 +40,10 @@ This package provides the Haskell %{pkgn
|
||||
%ghc_pkg_recache\
|
||||
\
|
||||
%files -n %{basepkg} -f %{basepkg}.files\
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Index: ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc
|
||||
Index: ghc-rpm-macros-master/ghc-rpm-macros.ghc
|
||||
===================================================================
|
||||
--- ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.orig/ghc-rpm-macros.ghc
|
||||
+++ ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc
|
||||
@@ -44,7 +44,7 @@ fi
|
||||
--- ghc-rpm-macros-master.orig/ghc-rpm-macros.ghc
|
||||
+++ ghc-rpm-macros-master/ghc-rpm-macros.ghc
|
||||
@@ -48,7 +48,7 @@ fi
|
||||
%define docdir %{ghclibdocdir}/%{pkgname}\
|
||||
rm -f %{basepkg}.files %{basepkg}-devel.files\
|
||||
if [ -d "%{buildroot}%{pkgdir}" ]; then\
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5dcdd3d5176f5b3315f3c781118eaa8e0af82259962ee26d2eb3b9b752b87d3e
|
||||
size 22268
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3a3373ff16dfb9cd4191186b565f52df64b9484b737d21478632f94d7c9f2b21
|
||||
size 21128
|
||||
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat May 10 20:56:02 UTC 2014 - peter.trommler@ohm-hochschule.de
|
||||
|
||||
- update to 1.2.7
|
||||
* set datasubdir in cabal_configure for ghc-7.8
|
||||
* abort ghc_fix_dynamic_rpath if no chrpath
|
||||
* update license tag to GPLv3+
|
||||
* set Url field when generating subpackages
|
||||
- refresh patches add-group.patch, files-defattr.patch,
|
||||
fix-genfilelists.patch, suse-disable-debug-patches.patch
|
||||
- remove macros.ghc-suse
|
||||
* they never worked on OBS
|
||||
- add patch disable-execstack.patch
|
||||
* disable execstack workaround on ppc64le
|
||||
* prelink is not available on ppc64le yet
|
||||
* ghc does not handle executable stack note properly
|
||||
you will probably get rpmlint warnings about it
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 1 08:46:53 UTC 2014 - peter.trommler@ohm-hochschule.de
|
||||
|
||||
- update to 1.2.2
|
||||
* fix error message
|
||||
- use stable URL (no git hash)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 16 15:26:01 UTC 2013 - peter.trommler@ohm-hochschule.de
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ghc-rpm-macros
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,23 +16,22 @@
|
||||
#
|
||||
|
||||
|
||||
%global git_hash 4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52
|
||||
%global git_hash 48199c851a2c672494e295b3cbfc4eded20c3a11
|
||||
|
||||
%global macros_dir %{_sysconfdir}/rpm
|
||||
|
||||
%global without_hscolour 1
|
||||
|
||||
Name: ghc-rpm-macros
|
||||
Version: 1.2
|
||||
Version: 1.2.7
|
||||
Release: 0
|
||||
Summary: RPM Macros for building packages for GHC
|
||||
License: GPL-3.0
|
||||
License: GPL-3.0+
|
||||
Group: Development/Libraries/Other
|
||||
|
||||
Url: https://fedoraproject.org/wiki/Haskell_SIG
|
||||
|
||||
Source0: http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}-%{git_hash}.tar.bz2
|
||||
Source4: macros.ghc-suse
|
||||
Source0: http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}-%{git_hash}.tar.xz
|
||||
# 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
|
||||
@ -41,15 +40,28 @@ Patch2: add-group.patch
|
||||
Patch3: files-defattr.patch
|
||||
# PATCH-FIX-OPENSUSE suse-docdir.patch peter.trommler@ohm-hochschule.de -- fix location of docdir
|
||||
Patch4: suse-docdir.patch
|
||||
# PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.trommler@ohm-hochschule.de -- SLE's RPM is too old in 11 SP1 and SP2
|
||||
# PATCH-FIX_UPSTREAM fix-gen-filelists.patch
|
||||
Patch5: fix-gen-filelists.patch
|
||||
# PATCH-FIX-OPENSUSE disable-execstack.patch peter.trommler@ohm-hochschule.de -- disable execstack workaround
|
||||
Patch6: disable-execstack.patch
|
||||
# PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.trommler@ohm-hochschule.de -- SLE's RPM is too old in 11 SP1 and SP2 and SP3
|
||||
Patch100: sle-sp1-rpmdeps.patch
|
||||
|
||||
Requires: ghc-srpm-macros = %{version}-%{release}
|
||||
%ifnarch ppc64le
|
||||
# for execstack
|
||||
Requires: prelink
|
||||
%endif
|
||||
Requires: rpm
|
||||
%if %{undefined without_hscolour}
|
||||
Requires: hscolour
|
||||
%endif
|
||||
# This is a workaround for a bug in the automatic dependencies generator
|
||||
# ghc-deps.sh generates this symbol for extra libraries installed with a
|
||||
# dynamic ghc, currently only %%{ix86} and x86_64
|
||||
%ifarch %{ix86} x86_64
|
||||
Provides: ghc()
|
||||
%endif
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -64,7 +76,17 @@ Group: Development/Libraries/Other
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description extra
|
||||
Set of macros to build ghc packages that contain multiple subpackages.
|
||||
Extra macros used for subpackaging of Haskell libraries,
|
||||
for example in ghc and haskell-platform.
|
||||
|
||||
|
||||
%package -n ghc-srpm-macros
|
||||
Summary: RPM macros for building Haskell source packages
|
||||
Group: Development/Libraries/Other
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n ghc-srpm-macros
|
||||
Macros used when generating source Haskell rpm packages.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{git_hash}
|
||||
@ -72,6 +94,11 @@ Set of macros to build ghc packages that contain multiple subpackages.
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
# remove when prelink is available on ppc64le
|
||||
%ifarch ppc64le
|
||||
%patch6 -p1
|
||||
%endif
|
||||
%if 0%{?sles_version}
|
||||
%patch -P 100 -p1
|
||||
%endif
|
||||
@ -81,12 +108,11 @@ echo no build stage needed
|
||||
|
||||
%install
|
||||
install -p -D -m 0644 ./ghc-rpm-macros.ghc %{buildroot}%{macros_dir}/macros.ghc
|
||||
install -p -D -m 0644 ./ghc-rpm-macros.ghc-extra ${RPM_BUILD_ROOT}/%{macros_dir}/macros.ghc-extra
|
||||
install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.ghc-suse
|
||||
|
||||
install -p -D -m 0644 ./ghc-rpm-macros.ghc-extra %{buildroot}/%{macros_dir}/macros.ghc-extra
|
||||
install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
|
||||
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
|
||||
install -p -D -m 0644 ghc-rpm-macros.ghc-srpm %{buildroot}/%{macros_dir}/macros.ghc-srpm
|
||||
|
||||
# this is why this package is now arch-dependent:
|
||||
# turn off shared libs and dynamic linking on secondary archs
|
||||
@ -103,7 +129,6 @@ EOF
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING AUTHORS
|
||||
%config %{macros_dir}/macros.ghc
|
||||
%config %{macros_dir}/macros.ghc-suse
|
||||
%{_prefix}/lib/rpm/ghc-deps.sh
|
||||
%{_bindir}/cabal-tweak-dep-ver
|
||||
%{_bindir}/cabal-tweak-flag
|
||||
@ -112,4 +137,8 @@ EOF
|
||||
%defattr(-,root,root,-)
|
||||
%config %{macros_dir}/macros.ghc-extra
|
||||
|
||||
%files -n ghc-srpm-macros
|
||||
%defattr(-,root,root,-)
|
||||
%config %{macros_dir}/macros.ghc-srpm
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
# RPM macros for ghc on openSUSE
|
||||
|
||||
%ghc_arches %{ix86} x86_64
|
||||
@ -1,7 +1,7 @@
|
||||
Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc
|
||||
Index: ghc-rpm-macros-master/ghc-rpm-macros.ghc
|
||||
===================================================================
|
||||
--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc
|
||||
+++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc
|
||||
--- ghc-rpm-macros-master.orig/ghc-rpm-macros.ghc
|
||||
+++ ghc-rpm-macros-master/ghc-rpm-macros.ghc
|
||||
@@ -78,15 +78,25 @@ done\
|
||||
install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}.conf\
|
||||
%{nil}
|
||||
@ -27,6 +27,6 @@ Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.gh
|
||||
%ghc_lib_build_without_haddock()\
|
||||
-%global debug_package %{nil}\
|
||||
+%ghc_suse_disable_debug_packages\
|
||||
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\
|
||||
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\
|
||||
%cabal build\
|
||||
%{nil}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user