Accepting request 1000940 from zypp:Head

Softwarestack update

OBS-URL: https://build.opensuse.org/request/show/1000940
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=462

libzypp-17.31.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9bc1e0f1c1630a2cb185e5129c9c7475ea491dcbde21767255dc686d1d221ea7
-size 5491666

libzypp-17.31.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c6b6b13fa3e2d9378f05834a08122675aeba89ef7bee814895d7ba8a8efb8d9
+size 5490344

libzypp.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Sep  2 16:38:42 CEST 2022 - ma@suse.de
+
+- UsrEtc: Store logrotate files in %{_distconfdir} if defined
+  (fixes #402)
+- Log backtrace on SIGABRT too.
+- Need to explicitly enable building experimental code. Otherwise
+  an old Notcurses++ package which happens to be present in the
+  buildenv breaks the build (fixes #412).
+- Work around libyui/libyui#78 on code 15.4 and older.
+- Stop using std::*ary_function; deprecated and removed in c++17.
+- Don't expose header files which use types not available in
+  c++11.  In 15.3 and older, YAST and PK compile with -std=c++11.
+- version 17.31.1 (22)
+
 -------------------------------------------------------------------
 Tue Jul 19 16:03:01 CEST 2022 - ma@suse.de
 

libzypp.spec

@@ -43,7 +43,7 @@
 %bcond_with enable_preview_single_rpmtrans_as_default_for_zypper
 
 Name:           libzypp
-Version:        17.31.0
+Version:        17.31.1
 Release:        0
 License:        GPL-2.0-or-later
 URL:            https://github.com/openSUSE/libzypp
@@ -314,74 +314,34 @@ cd ..
 # Create filelist with translations
 %{find_lang} zypp
 
+%if %{defined _distconfdir}
+# Move logratate files form /etc/logrotate.d to /usr/etc/logrotate.d
+mkdir -p %{buildroot}/%{_distconfdir}/logrotate.d
+mv %{buildroot}/%{_sysconfdir}/logrotate.d/zypp-history.lr %{buildroot}%{_distconfdir}/logrotate.d
+%endif
+
 %check
 pushd build/tests
 LD_LIBRARY_PATH="$(pwd)/../zypp:$LD_LIBRARY_PATH" ctest --output-on-failure .
 popd
 
-%post
-/sbin/ldconfig
-if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi
+%if %{defined _distconfdir}
+%pre
+# Prepare for migration to /usr/etc; save any old .rpmsave
+for i in logrotate.d/zypp-history.lr; do
+   test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
+done
+%endif
 
-# convert old lock file to new
-# TODO make this a separate file?
-# TODO run the sript only when updating form pre-11.0 libzypp versions
-LOCKSFILE=%{_sysconfdir}/zypp/locks
-OLDLOCKSFILE=%{_sysconfdir}/zypp/locks.old
+%if %{defined _distconfdir}
+%posttrans
+# Migration to /usr/etc, restore just created .rpmsave
+for i in logrotate.d/zypp-history.lr; do
+   test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
+done
+%endif
 
-is_old(){
-  # if no such file, exit with false (1 in bash)
-  test -f ${LOCKSFILE} || return 1
-  TEMP_FILE=`mktemp`
-  cat ${LOCKSFILE} | sed '/^\#.*/ d;/.*:.*/d;/^[^[a-zA-Z\*?.0-9]*$/d' > ${TEMP_FILE}
-  if [ -s ${TEMP_FILE} ]
-  then
-    RES=0
-  else
-    RES=1
-  fi
-  rm -f ${TEMP_FILE}
-  return ${RES}
-}
-
-append_new_lock(){
-  case "$#" in
-    1 )
-  echo "
-solvable_name: $1
-match_type: glob
-" >> ${LOCKSFILE}
-;;
-    2 ) #TODO version
-  echo "
-solvable_name: $1
-match_type: glob
-Version:        $2
-" >> ${LOCKSFILE}
-;;
-    3 ) #TODO version
-  echo "
-solvable_name: $1
-match_type: glob
-Version:        $2 $3
-" >> ${LOCKSFILE}
-  ;;
-esac
-}
-
-die() {
-  echo $1
-  exit 1
-}
-
-if is_old ${LOCKSFILE}
-  then
-  mv -f ${LOCKSFILE} ${OLDLOCKSFILE} || die "cannot backup old locks"
-  cat ${OLDLOCKSFILE}| sed "/^\#.*/d"| while read line
-  do
-    append_new_lock $line
-  done
-fi
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
@@ -406,7 +366,11 @@ fi
 %dir               %{_sysconfdir}/zypp/credentials.d
 %config(noreplace) %{_sysconfdir}/zypp/zypp.conf
 %config(noreplace) %{_sysconfdir}/zypp/systemCheck
+%if %{defined _distconfdir}
+%{_distconfdir}/logrotate.d/zypp-history.lr
+%else
 %config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr
+%endif
 %dir               %{_var}/lib/zypp
 %if "%{_libexecdir}" != "%{_prefix}/lib"
 %dir               %{_libexecdir}/zypp