Hello community, here is the log from the commit of package libzypp checked in at Sat Mar 3 14:30:58 CET 2007. -------- --- libzypp/libzypp.changes 2007-03-01 18:46:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2007-03-02 16:13:23.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 2 16:11:16 CET 2007 - dmacvicar@suse.de + +- fix link order + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.N22523/_old 2007-03-03 14:30:41.000000000 +0100 +++ /var/tmp/diff_new_pack.N22523/_new 2007-03-03 14:30:41.000000000 +0100 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 3.0.0 -Release: 1 +Release: 2 Source: libzypp-3.0.0.tar.bz2 Prefix: /usr Provides: yast2-packagemanager @@ -123,6 +123,8 @@ %{_libdir}/pkgconfig/libzypp.pc %changelog +* Fri Mar 02 2007 - dmacvicar@suse.de +- fix link order * Tue Feb 27 2007 - dmacvicar@suse.de - merging from 10.2 / SP1 - #247459 ftp probing ++++++ libzypp-3.0.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.0.0/CMakeLists.txt new/libzypp-3.0.0/CMakeLists.txt --- old/libzypp-3.0.0/CMakeLists.txt 2007-03-01 18:07:30.000000000 +0100 +++ new/libzypp-3.0.0/CMakeLists.txt 2007-03-02 16:12:23.000000000 +0100 @@ -163,16 +163,6 @@ MESSAGE(STATUS "FindZypp.cmake will be installed in ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules") INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindZypp.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ) -MACRO(add_subdir_sources subdir real_sources) - MESSAGE( STATUS "Adding ${subdir} to sources..." ) - SET(sources) - INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/CMakeLists.txt") - FOREACH(src ${sources}) - MESSAGE( STATUS " - ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/${src}" ) - SET(real_sources ${real_sources} "${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/${src}") - ENDFOREACH(src) -ENDMACRO(add_subdir_sources) - #################################################################### # SUBDIRECTORIES # #################################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.0.0/package/libzypp.changes new/libzypp-3.0.0/package/libzypp.changes --- old/libzypp-3.0.0/package/libzypp.changes 2007-03-01 18:07:30.000000000 +0100 +++ new/libzypp-3.0.0/package/libzypp.changes 2007-03-02 16:12:23.000000000 +0100 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Mar 2 16:11:16 CET 2007 - dmacvicar@suse.de + +- fix link order + +------------------------------------------------------------------- Tue Feb 27 15:50:39 CET 2007 - dmacvicar@suse.de - merging from 10.2 / SP1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.0.0/zypp/CMakeLists.txt new/libzypp-3.0.0/zypp/CMakeLists.txt --- old/libzypp-3.0.0/zypp/CMakeLists.txt 2007-03-01 18:07:27.000000000 +0100 +++ new/libzypp-3.0.0/zypp/CMakeLists.txt 2007-03-02 16:12:18.000000000 +0100 @@ -185,13 +185,13 @@ base/GzStream.cc base/IOStream.cc base/InputStream.cc - base/LogControl.cc base/Measure.cc base/ProfilingFormater.cc base/ReferenceCounted.cc base/String.cc base/Sysconfig.cc base/Unit.cc + base/LogControl.cc ) SET( zypp_base_HEADERS @@ -957,12 +957,9 @@ ${zypp_ui_SRCS} ${zypp_parser_xmlstore_SRCS} ${zypp_data_SRCS} -${zypp_media_SRCS} ${zypp_target_hal_SRCS} ${zypp_parser_xml_SRCS} -${zypp_media_proxyinfo_SRCS} ${zypp_source_yum_SRCS} -${zypp_base_SRCS} ${zypp_solver_detail_SRCS} ${zypp_target_store_SRCS} ${zypp_url_SRCS} @@ -978,6 +975,9 @@ ${zypp_parser_inifile_SRCS} ${zypp_detail_SRCS} ${zypp_pool_SRCS} +${zypp_media_SRCS} +${zypp_media_proxyinfo_SRCS} +${zypp_base_SRCS} ) SET( zypp_lib_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.0.0/zypp/SourceFactory.cc new/libzypp-3.0.0/zypp/SourceFactory.cc --- old/libzypp-3.0.0/zypp/SourceFactory.cc 2007-03-01 18:07:27.000000000 +0100 +++ new/libzypp-3.0.0/zypp/SourceFactory.cc 2007-03-02 16:12:18.000000000 +0100 @@ -27,7 +27,11 @@ namespace zypp { ///////////////////////////////////////////////////////////////// - media::MediaManager media_mgr; + static media::MediaManager & media_mgr() + { + static media::MediaManager _v; + return _v; + } /////////////////////////////////////////////////////////////////// // @@ -91,13 +95,13 @@ ZYPP_THROW( Exception("Empty URL passed to SourceFactory") ); // open the media - media::MediaId id = media_mgr.open(url_r); - media_mgr.attach(id); + media::MediaId id = media_mgr().open(url_r); + media_mgr().attach(id); Pathname products_file = Pathname("media.1/products"); try { - media_mgr.provideFile (id, products_file); - products_file = media_mgr.localPath (id, products_file); + media_mgr().provideFile (id, products_file); + products_file = media_mgr().localPath (id, products_file); scanProductsFile (products_file, products_r); } catch ( const Exception & excpt ) { @@ -105,7 +109,7 @@ MIL << "No products description found on the Url" << endl; } - media_mgr.release(id); + media_mgr().release(id); } Source_Ref SourceFactory::createFrom( const source::SourceInfo &context ) @@ -200,14 +204,14 @@ #warning if cache_dir is provided, no need to open the original url // open the media - media::MediaId id = media_mgr.open(url_r); + media::MediaId id = media_mgr().open(url_r); // add dummy verifier - media_mgr.addVerifier(id, media::MediaVerifierRef(new media::NoVerifier())); + media_mgr().addVerifier(id, media::MediaVerifierRef(new media::NoVerifier())); // attach only if initializing from media and not from cache (#153073) if (cache_dir_r == "") { - media_mgr.attach(id); + media_mgr().attach(id); } else { @@ -235,7 +239,7 @@ // nohing } report->finish(url_r, ProbeSourceReport::NO_ERROR, ""); - + if ( probeYUM ) { Source_Ref source(createSourceImplWorkflowsource::yum::YUMSourceImpl( id, context )); @@ -275,14 +279,14 @@ #warning if cache_dir is provided, no need to open the original url // open the media - media::MediaId id = media_mgr.open(url_r); + media::MediaId id = media_mgr().open(url_r); // add dummy verifier - media_mgr.addVerifier(id, media::MediaVerifierRef(new media::NoVerifier())); + media_mgr().addVerifier(id, media::MediaVerifierRef(new media::NoVerifier())); // attach only if initializing from media and not from cache (#153073) if (cache_dir_r == "") { - media_mgr.attach(id); + media_mgr().attach(id); } else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org