Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory checked in at 2015-09-24 06:14:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-rpm-macros" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes 2015-08-28 08:27:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes 2015-09-24 06:14:25.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Sep 16 09:26:31 UTC 2015 - [email protected] + +- update to 1.4.94 +- refreshed remove-flags.patch +- dropped add-group.patch and files-defattr.patch + +------------------------------------------------------------------- Old: ---- add-group.patch files-defattr.patch ghc-rpm-macros-1.4.93.tar.xz New: ---- ghc-rpm-macros-1.4.94.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.pfcCH8/_old 2015-09-24 06:14:26.000000000 +0200 +++ /var/tmp/diff_new_pack.pfcCH8/_new 2015-09-24 06:14:26.000000000 +0200 @@ -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 @@ Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch [email protected] -- openSUSE way to disable debug packages Patch1: suse-disable-debug-packages.patch -# PATCH-FIX-OPENSUSE add-group.patch [email protected] -- Make sure a Group: tag is generated in subpackages; [email protected]: also puts libraries in System/Libraries, see package group guidelines -Patch2: add-group.patch -# PATCH-FIX-OPENSUSE files-defattr.patch [email protected] -- Make sure defattr macro used in files sections; [email protected]: see also specfile guidelines, files section, permissions -Patch3: files-defattr.patch # PATCH-FIX-OPENSUSE suse-docdir.patch [email protected] -- fix location of docdir Patch4: suse-docdir.patch # PATCH-FIX_UPSTREAM fix-gen-filelists.patch @@ -82,8 +78,6 @@ %prep %setup -q -n %{name}-%{version} %patch1 -p1 -b .debug -%patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch8 -p1 ++++++ ghc-rpm-macros-1.4.93.tar.xz -> ghc-rpm-macros-1.4.94.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.4.93/ghc-rpm-macros.spec new/ghc-rpm-macros-1.4.94/ghc-rpm-macros.spec --- old/ghc-rpm-macros-1.4.93/ghc-rpm-macros.spec 2015-05-11 06:28:04.000000000 +0200 +++ new/ghc-rpm-macros-1.4.94/ghc-rpm-macros.spec 2015-09-16 10:22:33.000000000 +0200 @@ -6,8 +6,8 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.4.93 -Release: 2%{?dist} +Version: 1.4.94 +Release: 1%{?dist} Summary: RPM macros for building packages for GHC License: GPLv3+ @@ -83,6 +83,9 @@ %changelog +* Wed Sep 16 2015 Jens Petersen <[email protected]> - 1.4.94-1 +- configure libsubdir using pkgkey like ghc-cabal + * Sat May 9 2015 Jens Petersen <[email protected]> - 1.4.93-2 - handle no ghc-srpm-macros for fedora < 21 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.4.93/macros.ghc new/ghc-rpm-macros-1.4.94/macros.ghc --- old/ghc-rpm-macros-1.4.93/macros.ghc 2015-05-11 06:28:04.000000000 +0200 +++ new/ghc-rpm-macros-1.4.94/macros.ghc 2015-09-16 10:22:33.000000000 +0200 @@ -25,7 +25,7 @@ %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 # install %cabal_install %cabal copy --destdir=%{buildroot} -v @@ -109,11 +109,13 @@ # ghc_bin_build %ghc_bin_build\ +%global debug_package %{nil}\ %cabal_configure\ %cabal build # ghc_lib_build_without_haddock [name] [version] %ghc_lib_build_without_haddock()\ +%global debug_package %{nil}\ %cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ %cabal build\ %{nil} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.4.93/macros.ghc-extra new/ghc-rpm-macros-1.4.94/macros.ghc-extra --- old/ghc-rpm-macros-1.4.93/macros.ghc-extra 2015-05-11 06:28:04.000000000 +0200 +++ new/ghc-rpm-macros-1.4.94/macros.ghc-extra 2015-09-16 10:22:33.000000000 +0200 @@ -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 @@ \ %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}\ @@ -38,8 +40,10 @@ %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} ++++++ remove-flags.patch ++++++ --- /var/tmp/diff_new_pack.pfcCH8/_old 2015-09-24 06:14:26.000000000 +0200 +++ /var/tmp/diff_new_pack.pfcCH8/_new 2015-09-24 06:14:26.000000000 +0200 @@ -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
