diff --git a/add-group.patch b/add-group.patch deleted file mode 100644 index e1cba5b..0000000 --- a/add-group.patch +++ /dev/null @@ -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}\ diff --git a/files-defattr.patch b/files-defattr.patch deleted file mode 100644 index c40abca..0000000 --- a/files-defattr.patch +++ /dev/null @@ -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} diff --git a/ghc-rpm-macros-1.4.93.tar.xz b/ghc-rpm-macros-1.4.93.tar.xz deleted file mode 100644 index c6a415c..0000000 --- a/ghc-rpm-macros-1.4.93.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73066538e9af8a33e3bc1e280db3fe12423d5e41b0ae70c1abfeef76a6bd6c4a -size 23044 diff --git a/ghc-rpm-macros-1.4.94.tar.xz b/ghc-rpm-macros-1.4.94.tar.xz new file mode 100644 index 0000000..95387f1 --- /dev/null +++ b/ghc-rpm-macros-1.4.94.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0af90cfccc0d1dd472aa72163dd9dae42b08809d5340e6da98e83912dda4465c +size 23076 diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index 37161e9..dddfa90 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -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 diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 7230fdc..7b74d74 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -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 diff --git a/remove-flags.patch b/remove-flags.patch index 17e8607..fcc5168 100644 --- a/remove-flags.patch +++ b/remove-flags.patch @@ -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