Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Leap:15.2 checked in at 2020-05-21 12:58:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ghc-rpm-macros (Old) and /work/SRC/openSUSE:Leap:15.2/.ghc-rpm-macros.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-rpm-macros" Thu May 21 12:58:11 2020 rev:19 rq:802884 version:1.9.95 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ghc-rpm-macros/ghc-rpm-macros.changes 2020-02-19 18:41:02.630177997 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ghc-rpm-macros.new.2738/ghc-rpm-macros.changes 2020-05-21 12:58:12.254646731 +0200 @@ -1,0 +2,5 @@ +Thu May 7 07:48:19 UTC 2020 - Peter Simons <psim...@suse.com> + +- Update to version 1.9.95. + +------------------------------------------------------------------- Old: ---- ghc-rpm-macros-1.9.90.tar.xz New: ---- ghc-rpm-macros-1.9.95.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.pa3cs8/_old 2020-05-21 12:58:12.554647384 +0200 +++ /var/tmp/diff_new_pack.pa3cs8/_new 2020-05-21 12:58:12.558647393 +0200 @@ -15,15 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%if 0%{?suse_version} <= 1320 -%global license doc -%endif - %global macros_dir %{_sysconfdir}/rpm %global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.9.90 +Version: 1.9.95 Release: 0 Summary: RPM Macros for building packages for GHC License: GPL-3.0-or-later @@ -78,10 +74,6 @@ install -p -D -m 0644 ghc.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs -%if 0%{?suse_version} <= 1320 -install -d -D -m 0755 %{buildroot}%{_datadir}/licenses -%endif - %files %doc AUTHORS @@ -97,9 +89,6 @@ %{_prefix}/lib/rpm/ghc-dirs.sh %dir %{_datadir}/%{name} %{_datadir}/%{name}/Setup.hs -%if 0%{?suse_version} <= 1320 -%dir %{_datadir}/licenses -%endif %files extra %config %{macros_dir}/macros.ghc-extra ++++++ ghc-rpm-macros-1.9.90.tar.xz -> ghc-rpm-macros-1.9.95.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.9.90/macros.ghc new/ghc-rpm-macros-1.9.95/macros.ghc --- old/ghc-rpm-macros-1.9.90/macros.ghc 2019-12-21 14:32:49.370616082 +0100 +++ new/ghc-rpm-macros-1.9.95/macros.ghc 2020-01-07 15:05:11.902288793 +0100 @@ -78,12 +78,12 @@ %else\ echo "%%dir ${pkgdir}" >> %{basepkg}.files\ %if %{undefined ghc_without_shared}\ -echo "%%attr(755,root,root) ${pkgdir}/libHS*-*ghc%{ghc_version}.so" >> %{basepkg}.files\ +echo "${pkgdir}/libHS*-*ghc%{ghc_version}.so" >> %{basepkg}.files\ %endif\ find %{buildroot}${pkgdir} -mindepth 1 -type d | sed "s/^/%dir /" >> %{basepkg}-devel.files\ find %{buildroot}${pkgdir} ! \\( -type d -o -name "libHS*.so" \\) >> %{basepkg}-devel.files\ %endif\ -echo "%%attr(755,root,root) %{?_ghcdynlibdir}%{!?_ghcdynlibdir:${pkgdir}}/libHS%{pkgnamever}-*ghc%{ghc_version}.so" >> %{basepkg}.files\ +echo "%%{?_ghcdynlibdir}%{!?_ghcdynlibdir:${pkgdir}}/libHS%{pkgnamever}-*ghc%{ghc_version}.so" >> %{basepkg}.files\ fi\ if [ -d "%{buildroot}%{docdir}" ]; then\ echo "%{docdir}" >> %{basepkg}-devel.files\ @@ -97,7 +97,9 @@ if [ -f "$i" ]; then\ sed -i -e "s!%{buildroot}!!g" $i\ fi\ -done\ +done\ +sort < %{basepkg}-devel.files | uniq > %{basepkg}-devel.filesx\ +mv %{basepkg}-devel.filesx %{basepkg}-devel.files\ %{nil}