Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory checked
in at 2014-12-06 13:45:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzypp (Old)
and /work/SRC/openSUSE:Factory/.libzypp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2014-11-26
22:59:53.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2014-12-06
13:45:12.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Nov 27 07:40:30 UTC 2014 - dims...@opensuse.org
+
+- Do not provide/obsolete yast2-packagemanager-devel by the -doc
+ package: the -devel package already does that.
+- Minor .spec cleanup (remove Authors section).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.pkK5Vx/_old 2014-12-06 13:45:14.000000000 +0100
+++ /var/tmp/diff_new_pack.pkK5Vx/_new 2014-12-06 13:45:14.000000000 +0100
@@ -134,17 +134,6 @@
%description
Package, Patch, Pattern, and Product Management
-Authors:
---------
- Michael Andres <m...@suse.de>
- Jiri Srain <jsr...@suse.cz>
- Stefan Schubert <sch...@suse.de>
- Duncan Mac-Vicar <dmacvi...@suse.de>
- Klaus Kaempf <kkae...@suse.de>
- Marius Tomaschewski <m...@suse.de>
- Stanislav Visnovsky <vis...@suse.cz>
- Ladislav Slezak <lsle...@suse.cz>
-
%package devel
Summary: Package, Patch, Pattern, and Product Management - developers
files
Group: Development/Libraries/C and C++
@@ -190,8 +179,6 @@
%package devel-doc
Summary: Package, Patch, Pattern, and Product Management - developers
files
Group: Documentation/HTML
-Provides: yast2-packagemanager-devel
-Obsoletes: yast2-packagemanager-devel
%description devel-doc
Package, Patch, Pattern, and Product Management - developers files
++++++ libzypp-14.30.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.30.2/libzypp.spec.cmake
new/libzypp-14.30.2/libzypp.spec.cmake
--- old/libzypp-14.30.2/libzypp.spec.cmake 2014-10-27 12:24:41.000000000
+0100
+++ new/libzypp-14.30.2/libzypp.spec.cmake 2014-11-27 15:08:48.000000000
+0100
@@ -134,17 +134,6 @@
%description
Package, Patch, Pattern, and Product Management
-Authors:
---------
- Michael Andres <m...@suse.de>
- Jiri Srain <jsr...@suse.cz>
- Stefan Schubert <sch...@suse.de>
- Duncan Mac-Vicar <dmacvi...@suse.de>
- Klaus Kaempf <kkae...@suse.de>
- Marius Tomaschewski <m...@suse.de>
- Stanislav Visnovsky <vis...@suse.cz>
- Ladislav Slezak <lsle...@suse.cz>
-
%package devel
Summary: Package, Patch, Pattern, and Product Management - developers
files
Group: Development/Libraries/C and C++
@@ -190,8 +179,6 @@
%package devel-doc
Summary: Package, Patch, Pattern, and Product Management - developers
files
Group: Documentation/HTML
-Provides: yast2-packagemanager-devel
-Obsoletes: yast2-packagemanager-devel
%description devel-doc
Package, Patch, Pattern, and Product Management - developers files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.30.2/package/libzypp.changes
new/libzypp-14.30.2/package/libzypp.changes
--- old/libzypp-14.30.2/package/libzypp.changes 2014-11-11 17:12:50.000000000
+0100
+++ new/libzypp-14.30.2/package/libzypp.changes 2014-11-27 15:08:48.000000000
+0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Nov 27 07:40:30 UTC 2014 - dims...@opensuse.org
+
+- Do not provide/obsolete yast2-packagemanager-devel by the -doc
+ package: the -devel package already does that.
+- Minor .spec cleanup (remove Authors section).
+
+-------------------------------------------------------------------
Tue Nov 11 17:09:28 CET 2014 - m...@suse.de
- Call rpm with '--noglob' (bnc#892431)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.30.2/zypp/base/String.cc
new/libzypp-14.30.2/zypp/base/String.cc
--- old/libzypp-14.30.2/zypp/base/String.cc 2014-07-01 11:30:28.000000000
+0200
+++ new/libzypp-14.30.2/zypp/base/String.cc 2014-11-21 10:48:41.000000000
+0100
@@ -303,14 +303,17 @@
std::string & replaceAll( std::string & str_r, const std::string & from_r,
const std::string & to_r )
{
- std::string::size_type pos = 0;
- while ( (pos = str_r.find( from_r, pos )) != std::string::npos )
+ if ( ! from_r.empty() )
{
- str_r.replace( pos, from_r.size(), to_r );
- pos += to_r.size();
+ std::string::size_type pos = 0;
+ while ( (pos = str_r.find( from_r, pos )) != std::string::npos )
+ {
+ str_r.replace( pos, from_r.size(), to_r );
+ pos += to_r.size();
- if ( pos >= str_r.length() )
- break;
+ if ( pos >= str_r.length() )
+ break;
+ }
}
return str_r;
}
@@ -323,15 +326,18 @@
std::string & replaceAllFun( std::string & str_r, const std::string &
from_r, function<std::string()> to_r )
{
- std::string::size_type pos = 0;
- while ( (pos = str_r.find( from_r, pos )) != std::string::npos )
+ if ( ! from_r.empty() )
{
- std::string to( to_r() );
- str_r.replace( pos, from_r.size(), to );
- pos += to.size();
+ std::string::size_type pos = 0;
+ while ( (pos = str_r.find( from_r, pos )) != std::string::npos )
+ {
+ std::string to( to_r() );
+ str_r.replace( pos, from_r.size(), to );
+ pos += to.size();
- if ( pos >= str_r.length() )
- break;
+ if ( pos >= str_r.length() )
+ break;
+ }
}
return str_r;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
