Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory checked in at 2012-11-24 20:54:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-rpm-macros", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes 2012-10-11 10:42:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes 2012-11-24 20:54:48.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Nov 17 12:41:05 UTC 2012 - [email protected] + +- openSUSE specific macros to disable debug packages +- refresh and remove .orig files from sle-sp1-rpmdeps.patch + +------------------------------------------------------------------- New: ---- suse-disable-debug-packages.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.dzGqq7/_old 2012-11-24 20:54:49.000000000 +0100 +++ /var/tmp/diff_new_pack.dzGqq7/_new 2012-11-24 20:54:49.000000000 +0100 @@ -1,8 +1,7 @@ # -# spec file for ghc-rpm-macros +# spec file for package ghc-rpm-macros # - -# Copyright (c) 2012 Peter Trommler [email protected] +# Copyright (c) 2012 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,18 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%global debug_package %{nil} %global macros_file %{_sysconfdir}/rpm/macros.ghc Name: ghc-rpm-macros Version: 0.95.5.1 -Release: 1 +Release: 0 Summary: Macros for building packages for GHC - -Group: Development/Libraries/Other License: GPL-3.0 -URL: https://fedoraproject.org/wiki/Haskell_SIG +Group: Development/Libraries/Other + +Url: https://fedoraproject.org/wiki/Haskell_SIG # This is a Fedora maintained package which is specific to # our distribution. Thus the source is only available from @@ -39,7 +37,8 @@ Source4: macros.ghc-suse Source5: cabal-tweak-dep-ver Patch: buildService.patch -Patch1: sle-sp1-rpmdeps.patch +Patch1: suse-disable-debug-packages.patch +Patch100: sle-sp1-rpmdeps.patch #Requires: redhat-rpm-config Requires: rpm @@ -55,16 +54,15 @@ %setup -c -T cp %{SOURCE1} %{SOURCE2} . cp %{SOURCE0} %{SOURCE3} . -%patch -p1 -%if %{defined sles_version} -%patch1 -p1 +%patch -p1 -b .obs +%patch1 -p1 -b .debug +%if 0%{?sles_version} +%patch -P 100 -p1 %endif - %build echo no build stage needed - %install install -p -D -m 0644 ./ghc-rpm-macros.ghc ${RPM_BUILD_ROOT}/%{macros_file} install -p -D -m 0644 %{SOURCE4} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc-suse @@ -83,7 +81,6 @@ EOF %endif - %files %defattr(-,root,root,-) %doc COPYING AUTHORS ++++++ sle-sp1-rpmdeps.patch ++++++ ++++ 711 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ghc-rpm-macros/sle-sp1-rpmdeps.patch ++++ and /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/sle-sp1-rpmdeps.patch ++++++ suse-disable-debug-packages.patch ++++++ Index: ghc-rpm-macros/ghc-rpm-macros.ghc =================================================================== --- ghc-rpm-macros.orig/ghc-rpm-macros.ghc +++ ghc-rpm-macros/ghc-rpm-macros.ghc @@ -241,15 +241,26 @@ This package contains the development fi find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\ %endif +# ghc_suse_disable_debug_packages +%ghc_suse_disable_debug_packages\ +%global debug_package %{nil}\ +%global __debug_install_post %{nil}\ +%global suse_insert_debug_package %{nil}\ +echo "/usr/lib/debug" > debugfiles.list\ +mkdir -p $RPM_BUILD_ROOT/usr/lib/debug\ +echo "/usr/src/debug" > debugsources.list\ +mkdir -p $RPM_BUILD_ROOT/usr/src/debug + + # ghc_bin_build %ghc_bin_build\ -%global debug_package %{nil}\ +%ghc_suse_disable_debug_packages\ %cabal_configure\ %cabal build # ghc_lib_build_without_haddock [name] [version] %ghc_lib_build_without_haddock()\ -%global debug_package %{nil}\ +%ghc_suse_disable_debug_packages\ %cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1} %{!?ghc_with_lib_for_ghci:--disable-library-for-ghci}\ %cabal build\ %{nil} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
