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

libzypp-4.25.0.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b19aa8dad8ffede3dda7062a3f75353c67b0efbe56cfbbe0a146f26f7ae66af
+oid sha256:c3a7094ede34b1b7f86111d9dbec689bf9673d210dd855c770cd58239328882e
-size 10036504
+size 10038093

libzypp.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon May 26 17:23:24 CEST 2008 - jkupec@suse.cz
+
+- old2new locks file converter script added to %post (jredinger)
+- r 10227
+
+-------------------------------------------------------------------
+Mon May 26 11:48:35 CEST 2008 - schubi@suse.de
+
+- Do not regard packages with the same name while upgrading obsoleted
+  packages (bnc#394367)
+- r 10219 
+
+-------------------------------------------------------------------
+Sat May 24 01:23:44 CEST 2008 - dmacvicar@suse.de
+
+- revert commit don't check for existence of keys,
+  to avoid a non needed HEAD request. (related bnc#381280)
+  as it creates popup error callbacks due to the 404's in
+  the keys. Leave however the OnMediaLocation::optional()
+  API to look for another fix strategy.
+
 -------------------------------------------------------------------
 Fri May 23 15:52:20 CEST 2008 - dmacvicar@suse.de
 

libzypp.spec

@@ -18,7 +18,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 AutoReqProv:    on
 Summary:        Package, Patch, Pattern, and Product Management
 Version:        4.25.0
-Release:        2
+Release:        3
 Source:         libzypp-4.25.0.tar.bz2
 Source1:        libzypp-rpmlintrc
 Prefix:         /usr
@@ -121,6 +121,59 @@ cd ..
 %run_ldconfig
 if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi
 #%{prefix}/lib/zypp/zypp-migrate-sources
+# 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=/etc/zypp/locks
+OLDLOCKSFILE=/etc/zypp/locks.old
+is_old(){
+  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
 
 %postun
 %run_ldconfig
@@ -157,6 +210,19 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/pkgconfig/libzypp.pc
 
 %changelog
+* Mon May 26 2008 jkupec@suse.cz
+- old2new locks file converter script added to %%post (jredinger)
+- r 10227
+* Mon May 26 2008 schubi@suse.de
+- Do not regard packages with the same name while upgrading obsoleted
+  packages (bnc#394367)
+- r 10219
+* Sat May 24 2008 dmacvicar@suse.de
+- revert commit don't check for existence of keys,
+  to avoid a non needed HEAD request. (related bnc#381280)
+  as it creates popup error callbacks due to the 404's in
+  the keys. Leave however the OnMediaLocation::optional()
+  API to look for another fix strategy.
 * Fri May 23 2008 dmacvicar@suse.de
 - define path for messages and scripts and document
   them in zypp.conf