Hello community, here is the log from the commit of package perl-BSSolv for openSUSE:Factory checked in at 2012-11-25 13:15:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-BSSolv (Old) and /work/SRC/openSUSE:Factory/.perl-BSSolv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-BSSolv", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-BSSolv/perl-BSSolv.changes 2012-10-23 21:25:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-BSSolv.new/perl-BSSolv.changes 2012-11-25 13:15:17.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Nov 13 13:21:51 CET 2012 - [email protected] + +- use REPO_NO_LOCATION for newer libsolv versions + +------------------------------------------------------------------- +Mon Nov 12 17:56:53 CET 2012 - [email protected] + +- update to new libsolv to get a fixed debian parser + +------------------------------------------------------------------- +Mon Nov 12 13:52:00 UTC 2012 - [email protected] + +- go for 0.18 perl-BSSolv again +- Conflicts/Obsoletes is disabled for now + +------------------------------------------------------------------- Old: ---- libsolv-0.1.0.tar.bz2 New: ---- libsolv-0.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-BSSolv.spec ++++++ --- /var/tmp/diff_new_pack.wO53KZ/_old 2012-11-25 13:15:22.000000000 +0100 +++ /var/tmp/diff_new_pack.wO53KZ/_new 2012-11-25 13:15:22.000000000 +0100 @@ -15,12 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: perl-BSSolv Version: 0.18.2 Release: 0 Url: https://github.com/openSUSE/libsolv -Source: libsolv-0.1.0.tar.bz2 +Source: libsolv-0.2.0.tar.bz2 Source1: Makefile.PL Source2: BSSolv.pm Source3: BSSolv.xs @@ -52,8 +51,8 @@ BuildRequires: gcc-c++ BuildRequires: perl BuildRequires: rpm-devel -BuildRequires: zlib-devel BuildRequires: xz-devel +BuildRequires: zlib-devel #RHEL6 moved ExtUtils::MakeMaker outside the main perl package BuildRequires: perl(ExtUtils::MakeMaker) # the testsuite uses the check framework ++++++ BSSolv.xs ++++++ --- /var/tmp/diff_new_pack.wO53KZ/_old 2012-11-25 13:15:22.000000000 +0100 +++ /var/tmp/diff_new_pack.wO53KZ/_new 2012-11-25 13:15:22.000000000 +0100 @@ -356,6 +356,7 @@ queue_push2(todo, req, p); } } +#if 0 if (s->conflicts) { conp = s->repo->idarraydata + s->conflicts; @@ -386,8 +387,10 @@ } } } +#endif } +#if 0 static inline int expander_checkconflicts(Pool *pool, Id p, Map *installed, Id *conflicts, int isobsoletes) { @@ -407,6 +410,7 @@ } return 0; } +#endif #define ERROR_NOPROVIDER 1 #define ERROR_CHOICE 2 @@ -511,6 +515,7 @@ conflprov = 1; continue; } +#if 0 if (pool->solvables[p].conflicts && expander_checkconflicts(pool, p, &installed, pool->solvables[p].repo->idarraydata + pool->solvables[p].conflicts, 0)) { conflprov = 1; @@ -521,6 +526,7 @@ conflprov = 1; continue; } +#endif queue_push(&qq, p); } if (p) @@ -804,24 +810,31 @@ } +#ifndef REPO_NO_LOCATION +# define REPO_NO_LOCATION 0 +#endif + Id repodata_addbin(Repodata *data, char *path, char *s, int sl, char *sid) { - char *sp; - Id p; + Id p = 0; +#if REPO_NO_LOCATION == 0 + char *sp; +#endif if (sl >= 4 && !strcmp(s + sl - 4, ".rpm")) - p = repo_add_rpm(data->repo, (const char *)path, REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE|RPM_ADD_WITH_PKGID|RPM_ADD_NO_FILELIST|RPM_ADD_NO_RPMLIBREQS); + p = repo_add_rpm(data->repo, (const char *)path, REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE|REPO_NO_LOCATION|RPM_ADD_WITH_PKGID|RPM_ADD_NO_FILELIST|RPM_ADD_NO_RPMLIBREQS); else if (sl >= 4 && !strcmp(s + sl - 4, ".deb")) - p = repo_add_deb(data->repo, (const char *)path, REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE|DEBS_ADD_WITH_PKGID); + p = repo_add_deb(data->repo, (const char *)path, REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE|REPO_NO_LOCATION|DEBS_ADD_WITH_PKGID); #ifdef ARCH_ADD_WITH_PKGID else if (sl >= 11 && (!strcmp(s + sl - 11, ".pkg.tar.gz") || !strcmp(s + sl - 11, ".pkg.tar.xz"))) - p = repo_add_arch_pkg(data->repo, (const char *)path, REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE|ARCH_ADD_WITH_PKGID); + p = repo_add_arch_pkg(data->repo, (const char *)path, REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE|REPO_NO_LOCATION|ARCH_ADD_WITH_PKGID); #endif - else - return 0; if (!p) return 0; +#if REPO_NO_LOCATION != 0 + repodata_set_location(data, p, 0, 0, s); +#else if ((sp = strrchr(s, '/')) != 0) { *sp = 0; @@ -830,6 +843,7 @@ } else repodata_delete_uninternalized(data, p, SOLVABLE_MEDIADIR); +#endif repodata_set_str(data, p, buildservice_id, sid); return p; } @@ -1687,13 +1701,17 @@ (void)hv_store(RETVAL, "version", 7, newSVpv(ss, 0), 0); (void)hv_store(RETVAL, "arch", 4, newSVpv(pool_id2str(pool, s->arch), 0), 0); exportdeps(RETVAL, "provides", 8, s->repo, s->provides, SOLVABLE_PROVIDES); +#if 0 exportdeps(RETVAL, "obsoletes", 9, s->repo, s->obsoletes, SOLVABLE_OBSOLETES); exportdeps(RETVAL, "conflicts", 9, s->repo, s->conflicts, SOLVABLE_CONFLICTS); +#endif exportdeps(RETVAL, "requires", 8, s->repo, s->requires, SOLVABLE_REQUIRES); +#if 0 exportdeps(RETVAL, "recommends", 10, s->repo, s->recommends, SOLVABLE_RECOMMENDS); exportdeps(RETVAL, "suggests", 8, s->repo, s->suggests, SOLVABLE_SUGGESTS); exportdeps(RETVAL, "supplements", 11, s->repo, s->supplements, SOLVABLE_SUPPLEMENTS); exportdeps(RETVAL, "enhances", 8, s->repo, s->enhances, SOLVABLE_ENHANCES); +#endif if (solvable_lookup_void(s, SOLVABLE_SOURCENAME)) ss = pool_id2str(pool, s->name); else ++++++ libsolv-0.1.0.tar.bz2 -> libsolv-0.2.0.tar.bz2 ++++++ ++++ 6759 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
