Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at 2012-01-24 12:24:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-pkg-bindings", Maintainer is "lsle...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings-devel-doc.changes 2011-09-23 12:53:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings-devel-doc.changes 2012-01-24 12:24:34.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 25 09:09:39 UTC 2011 - co...@suse.com + +- avoid duplicated index.html in installed docs + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes 2011-10-10 14:13:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes 2012-01-24 12:24:34.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Dec 6 13:29:53 UTC 2011 - lsle...@suse.cz + +- fixed reloading of repositories which have been removed during + service reload (bnc#724449) +- 2.22.0 + +------------------------------------------------------------------- +Fri Nov 25 12:24:13 UTC 2011 - co...@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.21.11.tar.bz2 New: ---- openSUSE-11.4.diff yast2-pkg-bindings-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.ae0Lcy/_old 2012-01-24 12:24:36.000000000 +0100 +++ /var/tmp/diff_new_pack.ae0Lcy/_new 2012-01-24 12:24:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-pkg-bindings-devel-doc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,25 +15,34 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-pkg-bindings-devel-doc -Version: 2.21.11 +Version: 2.22.0 Release: 0 -License: GPL -Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.21.11.tar.bz2 +Source0: yast2-pkg-bindings-2.22.0.tar.bz2 Prefix: %_prefix # same as in the main package (because we use the same configure.in.in) -BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools +BuildRequires: blocxx-devel +BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: libgcrypt-devel +BuildRequires: libtool +BuildRequires: libxcrypt-devel +BuildRequires: libxslt +BuildRequires: libzypp-devel +BuildRequires: perl-XML-Writer +BuildRequires: sgml-skel +BuildRequires: yast2-core-devel +BuildRequires: yast2-devtools BuildArch: noarch Requires: yast2-pkg-bindings = %{version} Summary: YaST2 - Documentation for yast2-pkg-bindings package +License: GPL-2.0 Group: Documentation/HTML %description @@ -42,28 +51,28 @@ from the pkg-bindings sources. %prep -%setup -n yast2-pkg-bindings-2.21.11 +%setup -n yast2-pkg-bindings-%{version} # build only documentation, ignore all other directories echo "doc" > SUBDIRS %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -73,9 +82,9 @@ %files %defattr(-,root,root) -%doc %{prefix}/share/doc/packages/yast2-pkg-bindings/html -%dir %{prefix}/share/doc/packages/yast2-pkg-bindings -%exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/COPYING -%exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/README +%doc %{_prefix}/share/doc/packages/yast2-pkg-bindings/html +%dir %{_prefix}/share/doc/packages/yast2-pkg-bindings +%exclude %{_prefix}/share/doc/packages/yast2-pkg-bindings/COPYING +%exclude %{_prefix}/share/doc/packages/yast2-pkg-bindings/README %changelog ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.ae0Lcy/_old 2012-01-24 12:24:36.000000000 +0100 +++ /var/tmp/diff_new_pack.ae0Lcy/_new 2012-01-24 12:24:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-pkg-bindings # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,30 +15,41 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-pkg-bindings -Version: 2.21.11 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.21.11.tar.bz2 - -Prefix: /usr +Source0: yast2-pkg-bindings-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0+ -BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools +BuildRequires: blocxx-devel +BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: libgcrypt-devel +BuildRequires: libtool +BuildRequires: libxcrypt-devel +BuildRequires: libxslt BuildRequires: libzypp-devel >= 6.10.0 +BuildRequires: perl-XML-Writer +BuildRequires: sgml-skel +BuildRequires: yast2-core-devel +BuildRequires: yast2-devtools # new GPG callbacks Requires: libzypp >= 6.6.0 Summary: YaST2 - Package Manager Access +License: GPL-2.0 +Group: System/YaST %if 0%{?suse_version} == 1130 -Patch0: openSUSE-11.3.diff +Patch113: openSUSE-11.3.diff +%endif + +%if 0%{?suse_version} == 1140 +Patch114: openSUSE-11.4.diff %endif %description @@ -46,32 +57,35 @@ library in YaST2. %prep -%setup -n yast2-pkg-bindings-2.21.11 +%setup -n yast2-pkg-bindings-%{version} # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS %if 0%{?suse_version} == 1130 -%patch0 -p0 +%patch113 -p0 +%endif +%if 0%{?suse_version} == 1140 +%patch114 -p0 %endif %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -85,6 +99,6 @@ %defattr(-,root,root) %{_libdir}/YaST2/plugin/libpy2Pkg.so.* %{_libdir}/YaST2/plugin/libpy2Pkg.so -%doc %{prefix}/share/doc/packages/yast2-pkg-bindings +%doc %{_prefix}/share/doc/packages/yast2-pkg-bindings %changelog ++++++ openSUSE-11.3.diff ++++++ --- /var/tmp/diff_new_pack.ae0Lcy/_old 2012-01-24 12:24:36.000000000 +0100 +++ /var/tmp/diff_new_pack.ae0Lcy/_new 2012-01-24 12:24:36.000000000 +0100 @@ -15,6 +15,15 @@ =================================================================== --- src/Package.cc (revision 64337) +++ src/Package.cc (working copy) +@@ -1812,8 +1812,6 @@ + { + y2milestone("Resetting the solver"); + zypp_ptr()->resolver()->reset(); +- // reset also the dist upgrade flag (set by PkgUpdateAll()) +- zypp_ptr()->resolver()->setUpgradeMode(false); + } + } + @@ -2107,9 +2107,6 @@ switch (d_mode) ++++++ openSUSE-11.4.diff ++++++ Index: src/Package.cc =================================================================== --- src/Package.cc (revision 66348) +++ src/Package.cc (revision 66349) @@ -1812,8 +1812,6 @@ { y2milestone("Resetting the solver"); zypp_ptr()->resolver()->reset(); - // reset also the dist upgrade flag (set by PkgUpdateAll()) - zypp_ptr()->resolver()->setUpgradeMode(false); } } ++++++ yast2-pkg-bindings-2.21.11.tar.bz2 -> yast2-pkg-bindings-2.22.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.21.11/Makefile.am new/yast2-pkg-bindings-2.22.0/Makefile.am --- old/yast2-pkg-bindings-2.21.11/Makefile.am 2011-10-07 17:38:46.000000000 +0200 +++ new/yast2-pkg-bindings-2.22.0/Makefile.am 2011-12-06 16:25:47.000000000 +0100 @@ -20,7 +20,6 @@ IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING @@ -155,7 +154,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -185,21 +184,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.21.11/Makefile.in new/yast2-pkg-bindings-2.22.0/Makefile.in --- old/yast2-pkg-bindings-2.21.11/Makefile.in 2011-10-07 17:38:53.000000000 +0200 +++ new/yast2-pkg-bindings-2.22.0/Makefile.in 2011-12-06 16:25:53.000000000 +0100 @@ -322,7 +322,6 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ @@ -993,7 +992,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -1021,21 +1020,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.21.11/VERSION new/yast2-pkg-bindings-2.22.0/VERSION --- old/yast2-pkg-bindings-2.21.11/VERSION 2011-10-07 12:22:16.000000000 +0200 +++ new/yast2-pkg-bindings-2.22.0/VERSION 2011-12-06 16:25:32.000000000 +0100 @@ -1 +1 @@ -2.21.11 +2.22.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.21.11/configure new/yast2-pkg-bindings-2.22.0/configure --- old/yast2-pkg-bindings-2.21.11/configure 2011-10-07 17:38:52.000000000 +0200 +++ new/yast2-pkg-bindings-2.22.0/configure 2011-12-06 16:25:52.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-pkg-bindings 2.21.11. +# Generated by GNU Autoconf 2.68 for yast2-pkg-bindings 2.22.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.21.11' -PACKAGE_STRING='yast2-pkg-bindings 2.21.11' +PACKAGE_VERSION='2.22.0' +PACKAGE_STRING='yast2-pkg-bindings 2.22.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1363,7 +1363,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-pkg-bindings 2.21.11 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.22.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1435,7 +1435,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.21.11:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.22.0:";; esac cat <<\_ACEOF @@ -1553,7 +1553,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.21.11 +yast2-pkg-bindings configure 2.22.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2006,7 +2006,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-pkg-bindings $as_me 2.21.11, which was +It was created by yast2-pkg-bindings $as_me 2.22.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2936,7 +2936,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.21.11' + VERSION='2.22.0' cat >>confdefs.h <<_ACEOF @@ -3058,7 +3058,7 @@ -VERSION="2.21.11" +VERSION="2.22.0" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lsle...@suse.cz>" @@ -16660,7 +16660,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.21.11, which was +This file was extended by yast2-pkg-bindings $as_me 2.22.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16726,7 +16726,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-pkg-bindings config.status 2.21.11 +yast2-pkg-bindings config.status 2.22.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.21.11/configure.in new/yast2-pkg-bindings-2.22.0/configure.in --- old/yast2-pkg-bindings-2.21.11/configure.in 2011-10-07 17:38:46.000000000 +0200 +++ new/yast2-pkg-bindings-2.22.0/configure.in 2011-12-06 16:25:47.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-pkg-bindings dnl -dnl -- This file is generated by y2autoconf 2.21.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.21.11, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.22.0, http://bugs.opensuse.org/, yast2-pkg-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.11" +VERSION="2.22.0" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lsle...@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.21.11/doc/Makefile.am new/yast2-pkg-bindings-2.22.0/doc/Makefile.am --- old/yast2-pkg-bindings-2.21.11/doc/Makefile.am 2008-04-21 16:06:49.000000000 +0200 +++ new/yast2-pkg-bindings-2.22.0/doc/Makefile.am 2011-11-28 14:54:19.000000000 +0100 @@ -9,7 +9,7 @@ builtin = $(wildcard $(srcdir)/../src/*.cc) builtinxml := $(builtin:%.cc=%.xml) xmlfiles := $(foreach xml,$(builtinxml),$(notdir $(xml))) -htmlfiles = $(wildcard html/*.html) +htmlfiles = $(filter-out html/index.html, $(wildcard html/*.html)) html_DATA = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.21.11/doc/Makefile.in new/yast2-pkg-bindings-2.22.0/doc/Makefile.in --- old/yast2-pkg-bindings-2.21.11/doc/Makefile.in 2011-10-07 17:38:52.000000000 +0200 +++ new/yast2-pkg-bindings-2.22.0/doc/Makefile.in 2011-12-06 16:25:53.000000000 +0100 @@ -295,7 +295,7 @@ builtin = $(wildcard $(srcdir)/../src/*.cc) builtinxml := $(builtin:%.cc=%.xml) xmlfiles := $(foreach xml,$(builtinxml),$(notdir $(xml))) -htmlfiles = $(wildcard html/*.html) +htmlfiles = $(filter-out html/index.html, $(wildcard html/*.html)) html_DATA = \ html/yast2docs.css \ html/index.html \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.21.11/src/Service.cc new/yast2-pkg-bindings-2.22.0/src/Service.cc --- old/yast2-pkg-bindings-2.21.11/src/Service.cc 2011-09-22 16:01:08.000000000 +0200 +++ new/yast2-pkg-bindings-2.22.0/src/Service.cc 2011-12-06 16:27:22.000000000 +0100 @@ -19,7 +19,7 @@ */ /* - File: $Id: Service.cc 65938 2011-09-22 14:01:07Z lslezak $ + File: $Id: Service.cc 66998 2011-12-06 15:27:21Z lslezak $ Author: Ladislav Slezák <lsle...@novell.com> Summary: Functions for accessing services in the package management Namespace: Pkg @@ -382,11 +382,24 @@ // reload all repositories for (RepoCont::size_type idx = 0; idx != repos.size(); ++idx) { + YRepo_Ptr repo = repos[idx]; + // the repo has not been removed - if (!(repos[idx])->isDeleted()) + if (!repo->isDeleted()) { - y2milestone("Reloading repository %s", (repos[idx])->repoInfo().alias().c_str()); - repos[idx]->repoInfo() = repomanager.getRepositoryInfo((repos[idx])->repoInfo().alias()); + zypp::RepoInfo info(repo->repoInfo()); + y2milestone("Reloading repository %s", info.alias().c_str()); + + if (repomanager.hasRepo(info)) + { + repos[idx]->repoInfo() = repomanager.getRepositoryInfo(info.alias()); + } + else + { + y2milestone("Repository %s has been removed, unloading it", (info.alias().c_str())); + RemoveResolvablesFrom(repo); + repo->setDeleted(); + } } } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org