Author: lslezak Date: Wed Oct 12 12:33:27 2011 New Revision: 66390 URL: http://svn.opensuse.org/viewcvs/yast?rev=66390&view=rev Log: build fix for 11.3 and 11.4 (needed in YaST:Head) Added: trunk/pkg-bindings/package/openSUSE-11.4.diff Modified: trunk/pkg-bindings/package/openSUSE-11.3.diff trunk/pkg-bindings/yast2-pkg-bindings.spec.in Modified: trunk/pkg-bindings/package/openSUSE-11.3.diff URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/openSUSE-11.3.diff?rev=66390&r1=66389&r2=66390&view=diff ============================================================================== --- trunk/pkg-bindings/package/openSUSE-11.3.diff (original) +++ trunk/pkg-bindings/package/openSUSE-11.3.diff Wed Oct 12 12:33:27 2011 @@ -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) Added: trunk/pkg-bindings/package/openSUSE-11.4.diff URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/openSUSE-11.4.diff?rev=66390&view=auto ============================================================================== --- trunk/pkg-bindings/package/openSUSE-11.4.diff (added) +++ trunk/pkg-bindings/package/openSUSE-11.4.diff Wed Oct 12 12:33:27 2011 @@ -0,0 +1,13 @@ +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); + } + } + Modified: trunk/pkg-bindings/yast2-pkg-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/yast2-pkg-bindings.spec.in?rev=66390&r1=66389&r2=66390&view=diff ============================================================================== --- trunk/pkg-bindings/yast2-pkg-bindings.spec.in (original) +++ trunk/pkg-bindings/yast2-pkg-bindings.spec.in Wed Oct 12 12:33:27 2011 @@ -15,6 +15,10 @@ Patch0: openSUSE-11.3.diff %endif +%if 0%{?suse_version} == 1140 +Patch0: openSUSE-11.4.diff +%endif + %description This package contains a name space for accessing the package manager library in YaST2. @@ -23,7 +27,7 @@ # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS -%if 0%{?suse_version} == 1130 +%if 0%{?suse_version} == 1130 || 0%{?suse_version} == 1140 %patch0 -p0 %endif -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org