Mailinglist Archive: opensuse-commit (429 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package libzypp for openSUSE:Factory
checked in at Fri Jul 2 15:55:07 CEST 2010.



--------
--- libzypp/libzypp.changes     2010-06-25 12:11:03.000000000 +0200
+++ libzypp/libzypp.changes     2010-06-29 18:13:30.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Jun 29 17:46:13 CEST 2010 - ma@xxxxxxx
+
+- Fix CURLOPT_MAX_RECV_SPEED_LARGE expecting a curl_off_t argument.
+
+-------------------------------------------------------------------
+Tue Jun 29 10:22:06 CEST 2010 - ma@xxxxxxx
+
+- Respect zypp.conf policy settings when solving for update.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.Db6SC8/_old  2010-07-02 15:54:34.000000000 +0200
+++ /var/tmp/diff_new_pack.Db6SC8/_new  2010-07-02 15:54:34.000000000 +0200
@@ -24,7 +24,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Package, Patch, Pattern, and Product Management
 Version:        7.7.5
-Release:        3
+Release:        5
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
 Provides:       yast2-packagemanager

++++++ libzypp-7.7.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libzypp-7.7.5/package/libzypp.changes 
new/libzypp-7.7.5/package/libzypp.changes
--- old/libzypp-7.7.5/package/libzypp.changes   2010-06-25 12:08:28.000000000 
+0200
+++ new/libzypp-7.7.5/package/libzypp.changes   2010-06-29 17:51:25.000000000 
+0200
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Tue Jun 29 17:46:13 CEST 2010 - ma@xxxxxxx
+
+- Fix CURLOPT_MAX_RECV_SPEED_LARGE expecting a curl_off_t argument.
+
+-------------------------------------------------------------------
+Tue Jun 29 10:22:06 CEST 2010 - ma@xxxxxxx
+
+- Respect zypp.conf policy settings when solving for update.
+
+-------------------------------------------------------------------
 Fri Jun 25 11:35:52 CEST 2010 - ma@xxxxxxx
 
 - Don't bloat logfile by logging install progess values.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libzypp-7.7.5/zypp/media/MediaCurl.cc 
new/libzypp-7.7.5/zypp/media/MediaCurl.cc
--- old/libzypp-7.7.5/zypp/media/MediaCurl.cc   2010-06-25 12:08:28.000000000 
+0200
+++ new/libzypp-7.7.5/zypp/media/MediaCurl.cc   2010-06-29 17:51:25.000000000 
+0200
@@ -367,6 +367,7 @@
 
 // we use this define to unbloat code as this C setting option
 // and catching exception is done frequently.
+/** \todo deprecate SET_OPTION and use the typed versions below. */
 #define SET_OPTION(opt,val) do { \
     ret = curl_easy_setopt ( _curl, opt, val ); \
     if ( ret != 0) { \
@@ -375,6 +376,10 @@
     } \
   } while ( false )
 
+#define SET_OPTION_OFFT(opt,val) SET_OPTION(opt,(curl_off_t)val)
+#define SET_OPTION_LONG(opt,val) SET_OPTION(opt,(LONG)val)
+#define SET_OPTION_VOID(opt,val) SET_OPTION(opt,(void*)val)
+
 MediaCurl::MediaCurl( const Url &      url_r,
                       const Pathname & attach_point_hint_r )
     : MediaHandler( url_r, attach_point_hint_r,
@@ -636,7 +641,7 @@
   }
 
   if ( _settings.maxDownloadSpeed() != 0 )
-      SET_OPTION(CURLOPT_MAX_RECV_SPEED_LARGE, _settings.maxDownloadSpeed());
+      SET_OPTION_OFFT(CURLOPT_MAX_RECV_SPEED_LARGE, 
_settings.maxDownloadSpeed());
 
   /*---------------------------------------------------------------*
    *---------------------------------------------------------------*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libzypp-7.7.5/zypp/solver/detail/SATResolver.cc 
new/libzypp-7.7.5/zypp/solver/detail/SATResolver.cc
--- old/libzypp-7.7.5/zypp/solver/detail/SATResolver.cc 2010-06-25 
12:08:28.000000000 +0200
+++ new/libzypp-7.7.5/zypp/solver/detail/SATResolver.cc 2010-06-29 
17:51:25.000000000 +0200
@@ -823,7 +823,7 @@
     _solv->allowvendorchange = _allowvendorchange;
     _solv->dosplitprovides = true;
     _solv->noupdateprovide = _noupdateprovide;
-    _solv->dontinstallrecommended = true; // #FIXME dontinstallrecommended 
maybe set to false if it works correctly
+    _solv->dontinstallrecommended = _onlyRequires;
     _solv->distupgrade = _distupgrade;
     _solv->distupgrade_removeunsupported = _distupgrade_removeunsupported;
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx