Hello community, here is the log from the commit of package libsolv for openSUSE:Factory checked in at 2014-12-21 12:02:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-10-14 07:09:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsolv.new/libsolv.changes 2014-12-21 12:01:02.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 19 08:59:27 CET 2014 - m...@suse.de + +- add product:regflavor attribute [bnc#896224] +- bump version to 0.6.7 + +------------------------------------------------------------------- Old: ---- libsolv-0.6.6.tar.bz2 New: ---- libsolv-0.6.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsolv.spec ++++++ --- /var/tmp/diff_new_pack.wWX33m/_old 2014-12-21 12:01:03.000000000 +0100 +++ /var/tmp/diff_new_pack.wWX33m/_new 2014-12-21 12:01:03.000000000 +0100 @@ -17,7 +17,7 @@ Name: libsolv -Version: 0.6.6 +Version: 0.6.7 Release: 0 Url: git://gitorious.org/opensuse/libsolv.git Source: libsolv-%{version}.tar.bz2 ++++++ libsolv-0.6.6.tar.bz2 -> libsolv-0.6.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.6/CMakeLists.txt new/libsolv-0.6.7/CMakeLists.txt --- old/libsolv-0.6.6/CMakeLists.txt 2014-09-22 17:46:10.000000000 +0200 +++ new/libsolv-0.6.7/CMakeLists.txt 2014-11-07 16:25:42.000000000 +0100 @@ -129,7 +129,6 @@ IF (${have_system} STREQUAL x) MESSAGE (STATUS "Building for no system") - ADD_DEFINITIONS (-DNOSYSTEM) ENDIF (${have_system} STREQUAL x) IF (${have_system} STRGREATER xx) MESSAGE (FATAL_ERROR "Can only compile for one system type.") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.6/VERSION.cmake new/libsolv-0.6.7/VERSION.cmake --- old/libsolv-0.6.6/VERSION.cmake 2014-10-07 14:46:09.000000000 +0200 +++ new/libsolv-0.6.7/VERSION.cmake 2014-12-19 11:51:00.000000000 +0100 @@ -49,5 +49,5 @@ SET(LIBSOLV_MAJOR "0") SET(LIBSOLV_MINOR "6") -SET(LIBSOLV_PATCH "6") +SET(LIBSOLV_PATCH "7") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.6/examples/CMakeLists.txt new/libsolv-0.6.7/examples/CMakeLists.txt --- old/libsolv-0.6.6/examples/CMakeLists.txt 2014-07-01 11:09:49.000000000 +0200 +++ new/libsolv-0.6.7/examples/CMakeLists.txt 2014-11-07 16:25:42.000000000 +0100 @@ -1,6 +1,10 @@ +IF (SUSE OR FEDORA OR DEBIAN) + ADD_EXECUTABLE (solv solv.c) TARGET_LINK_LIBRARIES (solv libsolvext libsolv ${SYSTEM_LIBRARIES}) INSTALL(TARGETS solv DESTINATION ${BIN_INSTALL_DIR}) + +ENDIF (SUSE OR FEDORA OR DEBIAN) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.6/examples/solv.c new/libsolv-0.6.7/examples/solv.c --- old/libsolv-0.6.6/examples/solv.c 2014-09-16 10:56:09.000000000 +0200 +++ new/libsolv-0.6.7/examples/solv.c 2014-11-07 16:25:42.000000000 +0100 @@ -216,7 +216,6 @@ #define TYPE_PLAINDIR 3 #define TYPE_DEBIAN 4 -#ifndef NOSYSTEM static int read_repoinfos_sort(const void *ap, const void *bp) { @@ -224,7 +223,6 @@ const struct repoinfo *b = bp; return strcmp(a->alias, b->alias); } -#endif #if defined(SUSE) || defined(FEDORA) @@ -478,15 +476,6 @@ #endif -#ifdef NOSYSTEM -struct repoinfo * -read_repoinfos(Pool *pool, int *nrepoinfosp) -{ - *nrepoinfosp = 0; - return 0; -} -#endif - void free_repoinfos(struct repoinfo *repoinfos, int nrepoinfos) @@ -1733,6 +1722,7 @@ #endif repo = repo_create(pool, "@System"); + memset(&stb, 0, sizeof(stb)); #if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA)) printf("rpm database:"); if (stat(pool_prepend_rootdir_tmp(pool, "/var/lib/rpm/Packages"), &stb)) @@ -1743,10 +1733,6 @@ if (stat(pool_prepend_rootdir_tmp(pool, "/var/lib/dpkg/status"), &stb)) memset(&stb, 0, sizeof(stb)); #endif -#ifdef NOSYSTEM - printf("no installed database:"); - memset(&stb, 0, sizeof(stb)); -#endif calc_checksum_stat(&stb, REPOKEY_TYPE_SHA256, 0, installedcookie); if (usecachedrepo(repo, 0, installedcookie, 0)) printf(" cached\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.6/ext/repo_autopattern.c new/libsolv-0.6.7/ext/repo_autopattern.c --- old/libsolv-0.6.6/ext/repo_autopattern.c 2014-07-01 11:09:49.000000000 +0200 +++ new/libsolv-0.6.7/ext/repo_autopattern.c 2014-12-19 11:51:00.000000000 +0100 @@ -377,6 +377,8 @@ repodata_set_str(data, s2 - pool->solvables, PRODUCT_SHORTLABEL, newname); else if (!strcmp(pn, "product-register-target()") && evr) repodata_set_str(data, s2 - pool->solvables, PRODUCT_REGISTER_TARGET, newname); + else if (!strcmp(pn, "product-register-flavor()") && evr) + repodata_set_str(data, s2 - pool->solvables, PRODUCT_REGISTER_FLAVOR, newname); else if (!strcmp(pn, "product-type()") && evr) repodata_set_str(data, s2 - pool->solvables, PRODUCT_TYPE, newname); else if (!strcmp(pn, "product-cpeid()") && evr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.6/ext/repo_products.c new/libsolv-0.6.7/ext/repo_products.c --- old/libsolv-0.6.6/ext/repo_products.c 2014-07-01 11:09:49.000000000 +0200 +++ new/libsolv-0.6.7/ext/repo_products.c 2014-12-19 11:51:00.000000000 +0100 @@ -60,6 +60,7 @@ STATE_REGISTER, STATE_TARGET, STATE_REGRELEASE, + STATE_REGFLAVOR, STATE_PRODUCTLINE, STATE_REGUPDATES, STATE_REGUPDREPO, @@ -97,6 +98,7 @@ { STATE_LINGUAS, "lang", STATE_LANG, 0 }, { STATE_REGISTER, "target", STATE_TARGET, 1 }, { STATE_REGISTER, "release", STATE_REGRELEASE, 1 }, + { STATE_REGISTER, "flavor", STATE_REGFLAVOR, 1 }, { STATE_REGISTER, "updates", STATE_REGUPDATES, 0 }, { STATE_REGUPDATES, "repository", STATE_REGUPDREPO, 0 }, { NUMSTATES } @@ -366,6 +368,9 @@ case STATE_REGRELEASE: repodata_set_str(pd->data, pd->handle, PRODUCT_REGISTER_RELEASE, pd->content); break; + case STATE_REGFLAVOR: + repodata_set_str(pd->data, pd->handle, PRODUCT_REGISTER_FLAVOR, pd->content); + break; case STATE_CPEID: if (*pd->content) repodata_set_str(pd->data, pd->handle, SOLVABLE_CPEID, pd->content); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.6/package/libsolv.changes new/libsolv-0.6.7/package/libsolv.changes --- old/libsolv-0.6.6/package/libsolv.changes 2014-10-07 14:46:09.000000000 +0200 +++ new/libsolv-0.6.7/package/libsolv.changes 2014-12-19 11:51:00.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 19 08:59:27 CET 2014 - m...@suse.de + +- add product:regflavor attribute [bnc#896224] +- bump version to 0.6.7 + +------------------------------------------------------------------- Tue Oct 7 14:39:23 CEST 2014 - m...@suse.de - fix bug in reorder_dq_for_jobrules leading to crashes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.6/src/knownid.h new/libsolv-0.6.7/src/knownid.h --- old/libsolv-0.6.6/src/knownid.h 2014-07-01 11:09:49.000000000 +0200 +++ new/libsolv-0.6.7/src/knownid.h 2014-12-19 11:51:00.000000000 +0100 @@ -256,6 +256,8 @@ KNOWNID(SIGNATURE_EXPIRES, "signature:expires"), KNOWNID(SIGNATURE_DATA, "signature:data"), +KNOWNID(PRODUCT_REGISTER_FLAVOR, "product:regflavor"), /* installed and available product */ + KNOWNID(ID_NUM_INTERNAL, 0) #ifdef KNOWNID_INITIALIZE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.6/src/problems.c new/libsolv-0.6.7/src/problems.c --- old/libsolv-0.6.6/src/problems.c 2014-09-29 11:31:12.000000000 +0200 +++ new/libsolv-0.6.7/src/problems.c 2014-12-15 16:16:01.000000000 +0100 @@ -588,7 +588,7 @@ { Pool *pool = solv->pool; Queue redoq; - Queue problem, solution, problems_save; + Queue problem, solution, problems_save, branches_save; int i, j, nsol; int essentialok; unsigned int now; @@ -620,6 +620,10 @@ problems_save = solv->problems; memset(&solv->problems, 0, sizeof(solv->problems)); + /* save branches queue */ + branches_save = solv->problems; + memset(&solv->branches, 0, sizeof(solv->branches)); + /* extract problem from queue */ queue_init(&problem); for (i = solidx + 1; i < solv->solutions.count; i++) @@ -717,6 +721,10 @@ queue_free(&solv->problems); solv->problems = problems_save; + /* restore branches */ + queue_free(&solv->branches); + solv->branches = branches_save; + if (solv->cleandeps_mistakes) { if (oldmistakes) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org