Hello community, here is the log from the commit of package libsolv for openSUSE:Factory checked in at 2016-02-22 08:56:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsolv (Old) and /work/SRC/openSUSE:Factory/.libsolv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsolv" Changes: -------- --- /work/SRC/openSUSE:Factory/libsolv/libsolv.changes 2016-02-07 09:21:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libsolv.new/libsolv.changes 2016-02-22 08:56:12.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 15 16:46:31 CET 2016 - m...@suse.de + +- parse media number from baseurl +- support susedata.<lang>.xml language files +- bump version to 0.6.19 + +------------------------------------------------------------------- Old: ---- libsolv-0.6.18.tar.bz2 New: ---- libsolv-0.6.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsolv.spec ++++++ --- /var/tmp/diff_new_pack.o7sXrZ/_old 2016-02-22 08:56:13.000000000 +0100 +++ /var/tmp/diff_new_pack.o7sXrZ/_new 2016-02-22 08:56:13.000000000 +0100 @@ -17,7 +17,7 @@ Name: libsolv -Version: 0.6.18 +Version: 0.6.19 Release: 0 Url: https://github.com/openSUSE/libsolv Source: libsolv-%{version}.tar.bz2 ++++++ libsolv-0.6.18.tar.bz2 -> libsolv-0.6.19.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.18/VERSION.cmake new/libsolv-0.6.19/VERSION.cmake --- old/libsolv-0.6.18/VERSION.cmake 2016-01-29 14:20:43.000000000 +0100 +++ new/libsolv-0.6.19/VERSION.cmake 2016-02-15 16:50:44.000000000 +0100 @@ -49,5 +49,5 @@ SET(LIBSOLV_MAJOR "0") SET(LIBSOLV_MINOR "6") -SET(LIBSOLV_PATCH "18") +SET(LIBSOLV_PATCH "19") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.18/ext/repo_rpmmd.c new/libsolv-0.6.19/ext/repo_rpmmd.c --- old/libsolv-0.6.18/ext/repo_rpmmd.c 2015-07-06 11:05:04.000000000 +0200 +++ new/libsolv-0.6.19/ext/repo_rpmmd.c 2016-02-11 17:01:33.000000000 +0100 @@ -776,10 +776,20 @@ str = find_attr("href", atts); if (str) { - repodata_set_location(pd->data, handle, 0, 0, str); - str = find_attr("xml:base", atts); - if (str) - repodata_set_poolstr(pd->data, handle, SOLVABLE_MEDIABASE, str); + int medianr = 0; + const char *base = find_attr("xml:base", atts); + if (base && !strncmp(base, "media:", 6)) + { + /* check for the media number in the fragment */ + int l = strlen(base); + while (l && base[l - 1] >= '0' && base[l - 1] <= '9') + l--; + if (l && base[l - 1] == '#' && base[l]) + medianr = atoi(base + l); + } + repodata_set_location(pd->data, handle, medianr, 0, str); + if (base) + repodata_set_poolstr(pd->data, handle, SOLVABLE_MEDIABASE, base); } break; case STATE_CHECKSUM: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.18/package/libsolv.changes new/libsolv-0.6.19/package/libsolv.changes --- old/libsolv-0.6.18/package/libsolv.changes 2016-01-29 14:20:43.000000000 +0100 +++ new/libsolv-0.6.19/package/libsolv.changes 2016-02-15 16:50:44.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 15 16:46:31 CET 2016 - m...@suse.de + +- parse media number from baseurl +- support susedata.<lang>.xml language files +- bump version to 0.6.19 + +------------------------------------------------------------------- Fri Jan 29 14:17:26 CET 2016 - m...@suse.de - fix rule generation for linked packages [bnc#961738] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.18/tools/repo2solv.sh new/libsolv-0.6.19/tools/repo2solv.sh --- old/libsolv-0.6.18/tools/repo2solv.sh 2015-07-06 11:05:04.000000000 +0200 +++ new/libsolv-0.6.19/tools/repo2solv.sh 2016-02-11 17:01:33.000000000 +0100 @@ -28,7 +28,7 @@ local p=$2 local f if test -n "$t" -a -s repomd.xml ; then - f=`repomdxml2solv -q $t:location < repomd.xml 2>/dev/null` + f=`repomdxml2solv -q "$t:location" < repomd.xml 2>/dev/null` f=${f##*/} if test -f "$f" ; then echo "$f" @@ -44,6 +44,10 @@ fi } +repomd_types() { + test -s repomd.xml && repomdxml2solv -q type < repomd.xml +} + repomd_decompress() { case $1 in *.gz) gzip -dc "$1" ;; @@ -147,6 +151,17 @@ if test -f "$susedataxml" ; then repomd_decompress "$susedataxml" fi + # all the languages as well + for t in `repomd_types` ; do + case "$t" in + susedata.*) + susedataxml=`repomd_findfile "$t" "$t.xml"` + if test -f "$susedataxml" ; then + repomd_decompress "$susedataxml" + fi + ;; + esac + done echo '</rpmmd>' ) | sed 's/<?xml[^>]*>//g' | sed '1i\<?xml version="1.0" encoding="UTF-8"?>' | rpmmd2solv $parser_options > $primfile || exit 4 fi @@ -244,6 +259,9 @@ # Now default language susetags_findfile_cat packages.en + # DL (delta rpms) + susetags_findfile_cat packages.DL + # Now patterns. Not simply those files matching *.pat{,.gz,bz2}, # but only those mentioned in the file 'patterns' if test -f patterns ; then @@ -263,7 +281,7 @@ esac case $name in # ignore files we handled already - *.DU | *.en | *.FL | packages ) continue ;; + *.DU | *.en | *.FL | *.DL | packages ) continue ;; *) suff=${name#packages.} echo "=Lan: $suff"
