rpm/ghc-rpm-macros
SHA256
1
0
Fork 0
forked from pool/ghc-rpm-macros
Code Pull Requests Activity

Accepting request 331613 from devel:languages:haskell:lts

Browse Source 
- update to 1.4.94
- refreshed remove-flags.patch
- dropped add-group.path and files-defattr.patch

OBS-URL: https://build.opensuse.org/request/show/331613
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=51
This commit is contained in:
Peter Trommler 2015-09-18 13:57:02 +00:00 committed by Git OBS Bridge
parent c43e4d32e9
commit c5abec9436
7 changed files with 15 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
add-group.patch
View File

@ -1,20 +0,0 @@
Index: ghc-rpm-macros-1.4.93/macros.ghc-extra
===================================================================
--- ghc-rpm-macros-1.4.93.orig/macros.ghc-extra
+++ ghc-rpm-macros-1.4.93/macros.ghc-extra
@@ -9,6 +9,7 @@
%define basepkg %{ghc_prefix}-%{pkgname}\
%package -n %{basepkg}\
Summary: Haskell %{pkgname} library\
+Group: System/Libraries\
%{?1:Version: %{pkgver}}\
%{-l:License: %{-l*}}\
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\
+Group: Development/Languages/Other\
%{?1:Version: %{pkgver}}\
%{-l:License: %{-l*}}\
Requires(post): %{ghc_prefix}-compiler = %{ghc_version}\

15
files-defattr.patch
View File

@ -1,15 +0,0 @@
Index: ghc-rpm-macros-1.4.93/macros.ghc-extra
===================================================================
--- ghc-rpm-macros-1.4.93.orig/macros.ghc-extra
+++ ghc-rpm-macros-1.4.93/macros.ghc-extra
@@ -40,8 +40,10 @@ This package provides the Haskell %{pkgn
%ghc_pkg_recache\
\
%files -n %{basepkg} -f %{basepkg}.files\
+%defattr(-,root,root,-)\
%{?base_doc_files:%doc %base_doc_files}\
\
%files -n %{basepkg}-devel -f %{basepkg}-devel.files\
+%defattr(-,root,root,-)\
%{?devel_doc_files:%doc %devel_doc_files}\
%{nil}

3
ghc-rpm-macros-1.4.93.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:73066538e9af8a33e3bc1e280db3fe12423d5e41b0ae70c1abfeef76a6bd6c4a
size 23044

3
ghc-rpm-macros-1.4.94.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0af90cfccc0d1dd472aa72163dd9dae42b08809d5340e6da98e83912dda4465c
size 23076

7
ghc-rpm-macros.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 16 09:26:31 UTC 2015 - mimi.vx@gmail.com
- update to 1.4.94
- refreshed remove-flags.patch
- dropped add-group.path and files-defattr.patch
-------------------------------------------------------------------
Thu Aug 27 08:45:19 UTC 2015 - mimi.vx@gmail.com

8
ghc-rpm-macros.spec
View File

@ -21,7 +21,7 @@
%global without_hscolour 1
Name: ghc-rpm-macros
Version: 1.4.93
Version: 1.4.94
Release: 0
BuildArch: noarch
Summary: RPM Macros for building packages for GHC
@ -34,10 +34,6 @@ Url: https://fedoraproject.org/wiki/Haskell_SIG
Source0: %{name}-%{version}.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
Patch2: add-group.patch
# PATCH-FIX-OPENSUSE files-defattr.patch sbahling@suse.com -- Make sure defattr macro used in files sections; peter.trommler@ohm-hochschule.de: see also specfile guidelines, files section, permissions
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_UPSTREAM fix-gen-filelists.patch
@ -82,8 +78,6 @@ Macros used when generating source Haskell rpm packages.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .debug
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch8 -p1

8
remove-flags.patch
View File

@ -1,14 +1,14 @@
Index: ghc-rpm-macros-1.4.93/macros.ghc
Index: ghc-rpm-macros-1.4.94/macros.ghc
===================================================================
--- ghc-rpm-macros-1.4.93.orig/macros.ghc
+++ ghc-rpm-macros-1.4.93/macros.ghc
--- ghc-rpm-macros-1.4.94.orig/macros.ghc
+++ ghc-rpm-macros-1.4.94/macros.ghc
@@ -26,9 +26,7 @@ fi
%cabal_configure\
%ghc_check_bootstrap\
%global _hardened_ldflags %{nil}\
-CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\
-LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{ghc_pkgdocdir} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{ghc_pkgdocdir} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?cabal_configure_options} $cabal_configure_extra_options
# install