Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory checked in at 2013-10-13 12:15:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-09-29 19:23:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes 2013-10-13 12:15:44.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Oct 11 19:00:13 UTC 2013 - [email protected] + +- add add-group.patch as patch 2 +* add Group tag to subpackages (required for SLE) +* put libraries into System/Libraries (packaged guidelines) +* fix bnc#845572 +- add files-defattr.patch as patch 3 +* set file permissions according to specfile guidelines +- thanks to Scott Bahling for preparing those patches +- enable colorized documentation + +------------------------------------------------------------------- New: ---- add-group.patch files-defattr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.HnrCET/_old 2013-10-13 12:15:45.000000000 +0200 +++ /var/tmp/diff_new_pack.HnrCET/_new 2013-10-13 12:15:45.000000000 +0200 @@ -37,9 +37,13 @@ Patch: buildService.patch # 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-SLE sle-sp1-rpmdeps.patch [email protected] -- SLE's RPM is too old in 11 SP1 and SP2 Patch100: sle-sp1-rpmdeps.patch -#Requires: redhat-rpm-config + Requires: rpm %if %{undefined without_hscolour} Requires: hscolour @@ -64,6 +68,8 @@ %setup -q -n %{name}-%{git_hash} %patch -p1 -b .obs %patch1 -p1 -b .debug +%patch2 -p1 +%patch3 -p1 %if 0%{?sles_version} %patch -P 100 -p1 %endif ++++++ add-group.patch ++++++ diff -Nrup a/ghc-rpm-macros.ghc-extra b/ghc-rpm-macros.ghc-extra --- a/ghc-rpm-macros.ghc-extra 2013-04-24 09:08:41.000000000 +0200 +++ b/ghc-rpm-macros.ghc-extra 2013-10-08 13:42:47.232096618 +0200 @@ -21,6 +21,7 @@ %define basepkg ghc-%{pkgname}\ %package -n %{basepkg}\ Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}\ +Group: System/Libraries\ %{?1:Version: %{pkgver}}\ %{-l:License: %{-l*}}\ %{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")} @@ -72,6 +73,7 @@ Summary: %{?common_summary}%{!?co %define basepkg ghc-%{pkgname}\ %package -n %{basepkg}-devel\ Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} development files\ +Group: Development/Languages/Other\ %{?1:Version: %{pkgver}}\ %{-l:License: %{-l*}}\ %{?ghc_devel_requires}\ ++++++ files-defattr.patch ++++++ diff -Nrup a/ghc-rpm-macros.ghc-extra b/ghc-rpm-macros.ghc-extra --- a/ghc-rpm-macros.ghc-extra 2013-10-08 15:35:46.955154547 +0200 +++ b/ghc-rpm-macros.ghc-extra 2013-10-08 15:33:12.000000000 +0200 @@ -2,6 +2,7 @@ %ghc_shared_files\ %files -n %{basepkg} -f %{basepkg}.files\ +%defattr(-,root,root,-)\ %{?base_doc_files:%doc %base_doc_files}\ %{nil} @@ -54,6 +55,7 @@ Group: System/Libraries\ %ghc_devel_files\ %files -n %{basepkg}-devel -f %{basepkg}-devel.files\ +%defattr(-,root,root,-)\ %{?devel_doc_files:%doc %devel_doc_files}\ %{nil} ++++++ suse-disable-debug-packages.patch ++++++ --- /var/tmp/diff_new_pack.HnrCET/_old 2013-10-13 12:15:45.000000000 +0200 +++ /var/tmp/diff_new_pack.HnrCET/_new 2013-10-13 12:15:45.000000000 +0200 @@ -12,9 +12,9 @@ +%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\ ++mkdir -p %{buildroot}/usr/lib/debug\ +echo "/usr/src/debug" > debugsources.list\ -+mkdir -p $RPM_BUILD_ROOT/usr/src/debug ++mkdir -p %{buildroot}/usr/src/debug + # ghc_bin_build %ghc_bin_build\ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
