Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory checked in at 2023-08-07 15:29:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new.22712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-rpm-macros" Mon Aug 7 15:29:10 2023 rev:44 rq:1102612 version:2.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes 2023-04-04 21:23:00.434075904 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new.22712/ghc-rpm-macros.changes 2023-08-07 15:29:21.332411468 +0200 @@ -1,0 +2,8 @@ +Sun Aug 6 14:34:29 UTC 2023 - OndÅej Súkup <[email protected]> + +- update to 2.5.3 + * sync with upstream + * add post and postun action into ghc subpackages as opensuse + don't use filetriggers for ldconfig + +------------------------------------------------------------------- Old: ---- ghc-rpm-macros-2.5.2.tar.xz New: ---- ghc-rpm-macros-2.5.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.Nth0We/_old 2023-08-07 15:29:23.512424850 +0200 +++ /var/tmp/diff_new_pack.Nth0We/_new 2023-08-07 15:29:23.556425119 +0200 @@ -18,7 +18,7 @@ %global without_hscolour 1 Name: ghc-rpm-macros -Version: 2.5.2 +Version: 2.5.3 Release: 0 Summary: RPM Macros for building packages for GHC License: GPL-3.0-or-later ++++++ ghc-rpm-macros-2.5.2.tar.xz -> ghc-rpm-macros-2.5.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2.5.2/ghc-deps.sh new/ghc-rpm-macros-2.5.3/ghc-deps.sh --- old/ghc-rpm-macros-2.5.2/ghc-deps.sh 2023-03-28 22:44:04.594842761 +0200 +++ new/ghc-rpm-macros-2.5.3/ghc-deps.sh 2023-08-06 16:31:30.539282026 +0200 @@ -48,20 +48,28 @@ ;; */libHS*_p.a) pkgver=$(basename "$(dirname "$i")") - ids=$($GHC_PKG field "$pkgver" "$field" | sed -e "s/\(^\| \)rts\( \|$\)/ /" -e "s/bin-package-db-[^ ]\+//") + if [ -e "$BUILDROOT$PKGCONFDIR/$pkgver.conf" ]; then + ids=$($GHC_PKG field "$pkgver" "$field" | sed -e "s/\(^\| \)rts\( \|$\)/ /" -e "s/bin-package-db-[^ ]\+//") + else + conf=$(basename "$i" | sed -e "s%libHS%$BUILDROOT$PKGCONFDIR/%" -e 's%_p.a%.conf%') + name=$(grep "^name: " "$conf" | sed -e "s/name: *//") + ids=$($GHC_PKG field "$name" "$field" | sed -e "s/\(^\| \)rts\( \|$\)/ /" -e "s/bin-package-db-[^ ]\+//") + fi for d in $ids; do case $d in *-*-internal) ;; - *-*-xml-light) ;; *-*) case $field in id) echo "$GHCPREFIX-prof($d)" ;; *) - if [ -f "$PKGBASELIB"/*/libHS"${d}"_p.a -o -f "$BUILDROOT$PKGBASELIB"/*/libHS"${d}"_p.a -o -f "$PKGBASELIB"/*/*/libHS"${d}"_p.a -o -f "$BUILDROOT$PKGBASELIB"/*/*/libHS"${d}"_p.a ]; then - echo "$GHCPREFIX-prof($d)" - fi + for f in "$PKGBASELIB"/*/libHS"${d}"_p.a "$BUILDROOT$PKGBASELIB"/*/libHS"${d}"_p.a "$PKGBASELIB"/*/*/libHS"${d}"_p.a "$BUILDROOT$PKGBASELIB"/*/*/libHS"${d}"_p.a; do + if [ -f $f ]; then + echo "$GHCPREFIX-prof($d)" + break + fi + done ;; esac ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2.5.2/macros.ghc new/ghc-rpm-macros-2.5.3/macros.ghc --- old/ghc-rpm-macros-2.5.2/macros.ghc 2023-03-19 01:16:20.000000000 +0100 +++ new/ghc-rpm-macros-2.5.3/macros.ghc 2023-08-06 16:28:01.828459708 +0200 @@ -9,6 +9,8 @@ # compiler version %ghc_version %{?ghc_version_override}%{!?ghc_version_override:%(rpm -q --qf %%{version} %{?ghc_name}%{!?ghc_name:ghc}-compiler)} +%ghc_major_version %(echo %{ghc_version} | sed -e "s/\\(.*\\)\\.[0-9]\\+/\\1/") + # ghc_bin_build: -W: use default ghc (ie ignore ghc_name) %ghc_bin_build(W)\ %ghc_fix_doc_perms\ @@ -23,7 +25,7 @@ %if 0%{?rhel} && 0%{?rhel} < 8\ licensedirversion=%{?2:-%2}\ %endif\ -%cabal_configure %{?with_ghc_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_ghclicensedir}/ghc-%1${licensedirversion} --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ +%cabal_configure %{?with_ghc_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{!?1:%{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}}} %{?1:--docdir=%{_ghclicensedir}/ghc-%1${licensedirversion} --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ %cabal build %{?ghc_smp_mflags} %{?cabal_build_options}\ %{nil} @@ -140,7 +142,6 @@ %_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir} -# deprecated %ghclibplatform %{ghcliblib}%{?with_hadrian:/%{ghcplatform}} # Cabal has specific arch names diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2.5.2/macros.ghc-extra new/ghc-rpm-macros-2.5.3/macros.ghc-extra --- old/ghc-rpm-macros-2.5.2/macros.ghc-extra 2023-02-02 16:29:52.000000000 +0100 +++ new/ghc-rpm-macros-2.5.3/macros.ghc-extra 2023-08-06 16:44:04.595027197 +0200 @@ -74,6 +74,9 @@ This package provides the Haskell %{pkgname} profiling library.\ %endif\ \ +%post -n %{basepkg} -p /sbin/ldconfig\ +%postun -n %{basepkg} -p /sbin/ldconfig\ +\ %files -n %{basepkg} -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}.files\ \ %endif\
