Hello community, here is the log from the commit of package libzypp-bindings checked in at Thu Aug 14 00:30:49 CEST 2008. -------- --- libzypp-bindings/libzypp-bindings.changes 2008-07-25 20:26:48.000000000 +0200 +++ libzypp-bindings/libzypp-bindings.changes 2008-08-12 21:12:38.763759000 +0200 @@ -1,0 +2,21 @@ +Fri Aug 8 13:42:43 CEST 2008 - ma@suse.de + +- Remove ProductInfo. We don't replace Product. +- revision 10799 + +------------------------------------------------------------------- +Fri Aug 1 10:23:55 CEST 2008 ma@suse.de + +- Remove obsolete TranslatedText +- Add ProductInfo which is going to replace Product +- revision 10716 + +------------------------------------------------------------------- +Thu Jul 31 14:25:21 CEST 2008 ma@suse.de + +- Work around undefined symbols in libzypp. (bnc #391831) +- Adapt to zypp::Service being renamed to ServiceInfo +- revision 10707 +- version 0.4.7 + +------------------------------------------------------------------- Old: ---- libzypp-bindings-0.4.6.tar.bz2 New: ---- libzypp-bindings-0.4.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-bindings.spec ++++++ --- /var/tmp/diff_new_pack.P16646/_old 2008-08-14 00:29:26.000000000 +0200 +++ /var/tmp/diff_new_pack.P16646/_new 2008-08-14 00:29:26.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package libzypp-bindings (Version 0.4.6) +# spec file for package libzypp-bindings (Version 0.4.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,8 +19,8 @@ Name: libzypp-bindings -Version: 0.4.6 -Release: 8 +Version: 0.4.7 +Release: 1 License: GPL v2 or later Summary: Bindings for libzypp Group: Development/Sources @@ -120,10 +127,22 @@ %files -n perl-zypp %defattr(-,root,root,-) -/usr/lib/perl5/*/*/zypp.pm -/usr/lib/perl5/*/*/zypp.so +/usr/lib/perl5/vendor_perl/*/zypp.pm +/usr/lib/perl5/vendor_perl/*/*/zypp.so %changelog +* Fri Aug 08 2008 ma@suse.de +- Remove ProductInfo. We don't replace Product. +- revision 10799 + Fri Aug 1 10:23:55 CEST 2008 ma@suse.de +- Remove obsolete TranslatedText +- Add ProductInfo which is going to replace Product +- revision 10716 + Thu Jul 31 14:25:21 CEST 2008 ma@suse.de +- Work around undefined symbols in libzypp. (bnc #391831) +- Adapt to zypp::Service being renamed to ServiceInfo +- revision 10707 +- version 0.4.7 * Fri Jul 25 2008 ma@suse.de - Removed almost all local copies of zypp header files. This also removed some old classes no longer present in libzypp. ++++++ libzypp-bindings-0.4.6.tar.bz2 -> libzypp-bindings-0.4.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/examples/python/list_resolvables.py new/libzypp-bindings-0.4.7/examples/python/list_resolvables.py --- old/libzypp-bindings-0.4.6/examples/python/list_resolvables.py 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/examples/python/list_resolvables.py 2008-08-12 21:10:39.000000000 +0200 @@ -4,7 +4,7 @@ Z = zypp.ZYppFactory_instance().getZYpp() Z.initializeTarget( zypp.Pathname("/") ) -Z.addResolvables( Z.target().resolvables(), True ); +Z.target().load(); repoManager = zypp.RepoManager() repos = repoManager.knownRepositories() @@ -14,8 +14,7 @@ continue if not repoManager.isCached( repo ): repoManager.buildCache( repo ) - - Z.addResolvables( repoManager.createFromCache( repo ).resolvables() ) + repoManager.loadFromCache( repo ); print "Items: %d" % ( Z.pool().size() ) @@ -25,9 +24,9 @@ t = "i" else: t = "*" - print "%s %s:%s-%s.%s\t(%s)" % ( t, - item.resolvable().kind(), - item.resolvable().name(), - item.resolvable().edition(), - item.resolvable().arch(), - item.resolvable().repository().info().alias() ) + print "%s %s" % ( t , item.resolvable()) + #print "%s %s:%s-%s.%s\t(%s)" % ( t, + # item.resolvable().kind(), + ## item.resolvable().edition(), + # item.resolvable().arch(), + # item.resolvable().repository().info().alias() ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/examples/testImports.sh new/libzypp-bindings-0.4.7/examples/testImports.sh --- old/libzypp-bindings-0.4.6/examples/testImports.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/examples/testImports.sh 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,21 @@ +#! /bin/bash + +echo "====Ruby=========" +ruby <<EOF + require 'zypp' + include Zypp + zypp = ZYppFactory::instance.get_zypp +EOF + +echo "====Python=======" +python <<EOF +import zypp +zypp = zypp.ZYppFactory.instance().getZYpp() +EOF + +echo "====Perl=========" +perl - <<"EOF" + use zypp; + $zfactory = zyppc::ZYppFactory_instance(); + $zypp = $zfactory->getZYpp; +EOF \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/libzypp-bindings.spec.cmake new/libzypp-bindings-0.4.7/libzypp-bindings.spec.cmake --- old/libzypp-bindings-0.4.6/libzypp-bindings.spec.cmake 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/libzypp-bindings.spec.cmake 2008-08-12 21:10:39.000000000 +0200 @@ -78,7 +78,7 @@ %files -n perl-zypp %defattr(-,root,root,-) -/usr/lib/perl5/*/*/zypp.pm -/usr/lib/perl5/*/*/zypp.so +/usr/lib/perl5/vendor_perl/*/zypp.pm +/usr/lib/perl5/vendor_perl/*/*/zypp.so %changelog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/Arch.i new/libzypp-bindings-0.4.7/swig/Arch.i --- old/libzypp-bindings-0.4.6/swig/Arch.i 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/Arch.i 2008-08-12 21:10:39.000000000 +0200 @@ -5,3 +5,20 @@ %template(ArchCompatFun) std::unary_function<zypp::Arch, bool>; %include <zypp/Arch.h> + +%extend zypp::Arch +{ +#ifdef SWIGPYTHON +%rename ("__str__") string(); +#endif +#ifdef SWIGRUBY +%rename ("to_s") string(); +#endif + + std::string string() const + { + std::ostringstream str; + str << *self; + return str.str(); + } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/CMakeLists.txt new/libzypp-bindings-0.4.7/swig/CMakeLists.txt --- old/libzypp-bindings-0.4.6/swig/CMakeLists.txt 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/CMakeLists.txt 2008-08-12 21:10:39.000000000 +0200 @@ -1,7 +1,27 @@ +# +# CMakeLists.txt for libzypp-bindings/swig +# +# -ADD_SUBDIRECTORY(ruby) +SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/zypp.i" ) -ADD_SUBDIRECTORY(python) +# +# Let's see which target languages are available +# -ADD_SUBDIRECTORY(perl5) +FIND_PACKAGE(Ruby) +FIND_PACKAGE(PythonLibs) +FIND_PACKAGE(Perl) + +IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) + ADD_SUBDIRECTORY(ruby) +ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) + +IF (PYTHON_LIBRARY) + ADD_SUBDIRECTORY(python) +ENDIF(PYTHON_LIBRARY) + +IF (PERL_EXECUTABLE) + ADD_SUBDIRECTORY(perl5) +ENDIF (PERL_EXECUTABLE) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/Patch.i new/libzypp-bindings-0.4.7/swig/Patch.i --- old/libzypp-bindings-0.4.6/swig/Patch.i 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/Patch.i 2008-08-12 21:10:39.000000000 +0200 @@ -1,2 +1,5 @@ +%ignore zypp::Patch::reboot_needed; +%ignore zypp::Patch::affects_pkg_manager; +%ignore zypp::Patch::id; %include <zypp/Patch.h> \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/perl5/CMakeLists.txt new/libzypp-bindings-0.4.7/swig/perl5/CMakeLists.txt --- old/libzypp-bindings-0.4.6/swig/perl5/CMakeLists.txt 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/perl5/CMakeLists.txt 2008-08-12 21:10:39.000000000 +0200 @@ -1,48 +1,53 @@ -# cmake likes unique target names -SET(WRAP perl) +# +# CMakeLists.txt for libzypp-bindings/swig/perl5 +# +# !!Attn!!: This creates two files +# 1. zypp.so +# 2. zypp.pm +# and the .pm file gets loaded. +# + +# SWIG_OUPUT is per-target +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_perl.cc" ) + +EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{cppflags}" OUTPUT_VARIABLE PERL_CXXFLAGS) +EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{archlib}.\"/CORE\"" OUTPUT_VARIABLE PERL_CORE_DIR) +EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{installvendorarch}" OUTPUT_VARIABLE PERL_VENDOR_ARCH) +EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{installvendorlib}" OUTPUT_VARIABLE PERL_VENDOR_LIB) +EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{ccdlflags}" OUTPUT_VARIABLE PERL_LINK_FLAGS) -FIND_PACKAGE(Perl REQUIRED) - -EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{cppflags}" OUTPUT_VARIABLE PERL_CXX_FLAGS) - -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PERL_CXX_FLAGS}") +MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}") +MESSAGE(STATUS "Perl core dir: ${PERL_CORE_DIR}") +MESSAGE(STATUS "Perl vendor arch dir: ${PERL_VENDORDIR}") -EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{archlibexp}" OUTPUT_VARIABLE PERL_LIB_PATH) -SET( PERL_INS_PATH "${PERL_LIB_PATH}" ) -SET( PERL_LIB_PATH "${PERL_LIB_PATH}/CORE" ) +ADD_DEFINITIONS( ${PERL_CXXFLAGS} -Wno-unused -Wno-error ) +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PERL_CXXFLAGS}") -MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}") -MESSAGE(STATUS "Perl cpp-flags: ${PERL_CXX_FLAGS}") -MESSAGE(STATUS "Perl lib path: ${PERL_LIB_PATH}") +LINK_DIRECTORIES( ${PERL_CORE_DIR} ) -SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) -SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/zypp.i" ) +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +endif(COMMAND cmake_policy) ADD_CUSTOM_COMMAND ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx + OUTPUT ${SWIG_OUTPUT} COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for perl..." - COMMAND ${SWIG_EXECUTABLE} -DZYPP_DEPRECATED -c++ -perl5 -xmlout ${CMAKE_CURRENT_BINARY_DIR}/parse.xml -o ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx -I${ZYPP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../zypp.i + COMMAND ${SWIG_EXECUTABLE} -DZYPP_DEPRECATED -c++ -perl5 -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT} COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i ) -ADD_CUSTOM_TARGET( ${WRAP}_glue - DEPENDS ${SWIG_OUTPUT} -) - -ADD_LIBRARY( ${WRAP}_zypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) -SET_TARGET_PROPERTIES( ${WRAP}_zypp +ADD_LIBRARY( zypp_perl SHARED ${SWIG_OUTPUT} ) +SET_TARGET_PROPERTIES( zypp_perl PROPERTIES PREFIX "" OUTPUT_NAME zypp ) -ADD_DEPENDENCIES( ${WRAP}_zypp ${WRAP}_glue ) -INCLUDE_DIRECTORIES( ${PERL_LIB_PATH} ) +INCLUDE_DIRECTORIES( ${PERL_CORE_DIR} ) INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) -TARGET_LINK_LIBRARIES( ${WRAP}_zypp ${ZYPP_LIBRARY} ) - -INSTALL(TARGETS ${WRAP}_zypp LIBRARY DESTINATION ${PERL_INS_PATH}) -INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/zypp.pm DESTINATION ${PERL_INS_PATH}) +TARGET_LINK_LIBRARIES( zypp_perl ${ZYPP_LIBRARY} ) +INSTALL(TARGETS zypp_perl LIBRARY DESTINATION ${PERL_VENDOR_ARCH}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zypp.pm DESTINATION ${PERL_VENDOR_LIB}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/perl5/tests/CMakeLists.txt new/libzypp-bindings-0.4.7/swig/perl5/tests/CMakeLists.txt --- old/libzypp-bindings-0.4.6/swig/perl5/tests/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/perl5/tests/CMakeLists.txt 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,7 @@ +# +# CMakeLists.txt for libzypp-bindings/swig/perl5/tests +# + +ENABLE_TESTING() + +ADD_TEST(bindings_perl_loading perl ${CMAKE_CURRENT_SOURCE_DIR}/loading.pl) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/perl5/tests/loading.pl new/libzypp-bindings-0.4.7/swig/perl5/tests/loading.pl --- old/libzypp-bindings-0.4.6/swig/perl5/tests/loading.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/perl5/tests/loading.pl 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,6 @@ +#!/usr/bin/perl + +use lib '../../../build/swig/perl5'; + +use zypp; + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/perl5/tests/starting.pl new/libzypp-bindings-0.4.7/swig/perl5/tests/starting.pl --- old/libzypp-bindings-0.4.6/swig/perl5/tests/starting.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/perl5/tests/starting.pl 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,8 @@ +#!/usr/bin/perl + +use lib '../../../build/swig/perl5'; + +use zypp; + +$zfactory = zyppc::ZYppFactory_instance(); +$zypp = $zfactory->getZYpp; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/PoolItem.i new/libzypp-bindings-0.4.7/swig/PoolItem.i --- old/libzypp-bindings-0.4.6/swig/PoolItem.i 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/PoolItem.i 2008-08-12 21:10:39.000000000 +0200 @@ -7,7 +7,14 @@ %extend zypp::PoolItem { - std::string asString() const +#ifdef SWIGPYTHON +%rename ("__str__") string(); +#endif +#ifdef SWIGRUBY +%rename ("to_s") string(); +#endif + + std::string string() const { std::ostringstream str; str << *self; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/python/CMakeLists.txt new/libzypp-bindings-0.4.7/swig/python/CMakeLists.txt --- old/libzypp-bindings-0.4.6/swig/python/CMakeLists.txt 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/python/CMakeLists.txt 2008-08-12 21:10:39.000000000 +0200 @@ -1,45 +1,45 @@ -# cmake likes unique target names -SET(WRAP python) +# +# CMakeLists.txt for libzypp-bindings/swig/python +# +# !!Attn!!: This creates two files +# 1. zypp.so +# 2. zypp.py +# and the .py file gets imported. +# -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") +ENABLE_TESTING() +ADD_SUBDIRECTORY(tests) -FIND_PACKAGE(PythonInterp REQUIRED) -FIND_PACKAGE(PythonLibs REQUIRED) +# SWIG_OUPUT is per-target + +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_python.cc" ) +FIND_PACKAGE(PythonInterp REQUIRED) EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_PATH) MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") MESSAGE(STATUS "Python lib path: ${PYTHON_LIB_PATH}") MESSAGE(STATUS "Python include path: ${PYTHON_INCLUDE_PATH}") -SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) -SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/zypp.i" ) - ADD_CUSTOM_COMMAND ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx + OUTPUT ${SWIG_OUTPUT} COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for python..." - COMMAND ${SWIG_EXECUTABLE} -v -DZYPP_DEPRECATED -c++ -python -o ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx -I${ZYPP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../zypp.i + COMMAND ${SWIG_EXECUTABLE} -v -DZYPP_DEPRECATED -c++ -python -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT} COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i ) -ADD_CUSTOM_TARGET( ${WRAP}_glue - DEPENDS ${SWIG_OUTPUT} -) - -ADD_LIBRARY( ${WRAP}_zypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) -SET_TARGET_PROPERTIES( ${WRAP}_zypp +ADD_LIBRARY( zypp_python SHARED ${SWIG_OUTPUT} ) +SET_TARGET_PROPERTIES( zypp_python PROPERTIES PREFIX "" OUTPUT_NAME _zypp ) -ADD_DEPENDENCIES( ${WRAP}_zypp ${WRAP}_glue ) INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} ) INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) -TARGET_LINK_LIBRARIES( ${WRAP}_zypp ${ZYPP_LIBRARY} ) +TARGET_LINK_LIBRARIES( zypp_python ${ZYPP_LIBRARY} ) -INSTALL(TARGETS ${WRAP}_zypp LIBRARY DESTINATION ${PYTHON_LIB_PATH}) +INSTALL(TARGETS zypp_python LIBRARY DESTINATION ${PYTHON_LIB_PATH}) INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/zypp.py DESTINATION ${PYTHON_LIB_PATH}) - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/python/tests/CMakeLists.txt new/libzypp-bindings-0.4.7/swig/python/tests/CMakeLists.txt --- old/libzypp-bindings-0.4.6/swig/python/tests/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/python/tests/CMakeLists.txt 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,7 @@ +# +# CMakeLists.txt for libzypp-bindings/swig/python/tests +# + +ENABLE_TESTING() + +ADD_TEST(bindings_python_loading python ${CMAKE_CURRENT_SOURCE_DIR}/loading.py) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/python/tests/loading.py new/libzypp-bindings-0.4.7/swig/python/tests/loading.py --- old/libzypp-bindings-0.4.6/swig/python/tests/loading.py 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/python/tests/loading.py 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,13 @@ +import unittest + +import sys +sys.path.insert(0, '../../../build/swig/python') + +class TestSequenceFunctions(unittest.TestCase): + + def testloading(self): + import zypp + + +if __name__ == '__main__': + unittest.main() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/python/tests/starting.py new/libzypp-bindings-0.4.7/swig/python/tests/starting.py --- old/libzypp-bindings-0.4.6/swig/python/tests/starting.py 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/python/tests/starting.py 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,14 @@ +import unittest + +import sys +sys.path.insert(0, '../../../build/swig/python') + +class TestSequenceFunctions(unittest.TestCase): + + def testloading(self): + import zypp + zypp = zypp.ZYppFactory.instance().getZYpp() + assert zypp + +if __name__ == '__main__': + unittest.main() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/RepoInfo.i new/libzypp-bindings-0.4.7/swig/RepoInfo.i --- old/libzypp-bindings-0.4.6/swig/RepoInfo.i 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/RepoInfo.i 2008-08-12 21:10:39.000000000 +0200 @@ -3,6 +3,22 @@ %template(UrlSet) std::set<Url>; #endif +namespace zypp +{ + namespace repo + { + %ignore operator==; + %ignore operator!=; + %ignore operator<<; + %ignore operator<; + } +} +%include <zypp/repo/RepoInfoBase.h> + + +// This is due to a typo in libzypp < 5.4.0 +%ignore zypp::RepoInfo::defaultPrioity(); + %include <zypp/RepoInfo.h> typedef std::list<zypp::RepoInfo> RepoInfoList; %template(RepoInfoList) std::list<zypp::RepoInfo>; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/RepoManager.i new/libzypp-bindings-0.4.7/swig/RepoManager.i --- old/libzypp-bindings-0.4.6/swig/RepoManager.i 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/RepoManager.i 2008-08-12 21:10:39.000000000 +0200 @@ -1 +1,3 @@ +%ignore zypp::RepoManager::knownRepositories; + %include <zypp/RepoManager.h> \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/Repository.i new/libzypp-bindings-0.4.7/swig/Repository.i --- old/libzypp-bindings-0.4.6/swig/Repository.i 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/Repository.i 2008-08-12 21:10:39.000000000 +0200 @@ -1,2 +1,3 @@ +%ignore zypp::Repository::name; %include <zypp/Repository.h> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/ResObject.i new/libzypp-bindings-0.4.7/swig/ResObject.i --- old/libzypp-bindings-0.4.6/swig/ResObject.i 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/ResObject.i 2008-08-12 21:10:39.000000000 +0200 @@ -1,4 +1,6 @@ %ignore zypp::make_res_object; +%ignore zypp::ResObject::installsize; +%ignore zypp::ResObject::size; %include <zypp/ResObject.h> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/ruby/CMakeLists.txt new/libzypp-bindings-0.4.7/swig/ruby/CMakeLists.txt --- old/libzypp-bindings-0.4.6/swig/ruby/CMakeLists.txt 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/ruby/CMakeLists.txt 2008-08-12 21:10:39.000000000 +0200 @@ -1,44 +1,37 @@ -# cmake likes unique target names -SET(WRAP ruby) +# +# CMakeLists.txt for libzypp-bindings/swig/ruby +# -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") +ENABLE_TESTING() +ADD_SUBDIRECTORY(tests) -FIND_PACKAGE(Ruby REQUIRED) +# SWIG_OUPUT is per-target -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_ruby.cc" ) MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") -MESSAGE(STATUS "Ruby vendor arch dir: ${RUBY_VENDOR_ARCH_DIR}") +MESSAGE(STATUS "Ruby vendor arch dir: ${RUBY_VENDORARCH_DIR}") MESSAGE(STATUS "Ruby include path: ${RUBY_INCLUDE_PATH}") -SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) -SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/zypp.i" ) - ADD_CUSTOM_COMMAND ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx - COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for ruby..." - COMMAND ${SWIG_EXECUTABLE} -DZYPP_DEPRECATED -c++ -ruby -autorename -xmlout ${CMAKE_CURRENT_BINARY_DIR}/parse.xml -o ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx -I${ZYPP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../zypp.i + OUTPUT "${SWIG_OUTPUT}" + COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Ruby..." + COMMAND ${SWIG_EXECUTABLE} -DZYPP_DEPRECATED -c++ -ruby -autorename -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT} COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i ) -ADD_CUSTOM_TARGET( ${WRAP}_glue - DEPENDS ${SWIG_OUTPUT} -) +ADD_LIBRARY( zypp_ruby SHARED ${SWIG_OUTPUT} ) -ADD_LIBRARY( ${WRAP}_zypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) -SET_TARGET_PROPERTIES(${WRAP}_zypp - PROPERTIES - PREFIX "" - OUTPUT_NAME zypp -) -ADD_DEPENDENCIES( ${WRAP}_zypp ${WRAP}_glue ) +# name it 'zypp.so' +# and don't prefix with 'lib' +SET_TARGET_PROPERTIES( zypp_ruby PROPERTIES OUTPUT_NAME "zypp" PREFIX "" ) INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) -TARGET_LINK_LIBRARIES( ${WRAP}_zypp ${ZYPP_LIBRARY} ) -TARGET_LINK_LIBRARIES( ${WRAP}_zypp ${RUBY_LIBRARY} ) -INSTALL(TARGETS ${WRAP}_zypp LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR}) +TARGET_LINK_LIBRARIES( zypp_ruby ${RUBY_LIBRARY} ) +TARGET_LINK_LIBRARIES( zypp_ruby ${ZYPP_LIBRARY} ) +INSTALL(TARGETS zypp_ruby LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/ruby/tests/arch.rb new/libzypp-bindings-0.4.7/swig/ruby/tests/arch.rb --- old/libzypp-bindings-0.4.6/swig/ruby/tests/arch.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/ruby/tests/arch.rb 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,18 @@ +# +# Example for Arch +# + +$:.unshift "../../../build/swig/ruby" + +require 'test/unit' + +class LoadTest < Test::Unit::TestCase + require 'zypp' + include Zypp + def test_arch + a = Arch.new("i386") + assert a + puts a.to_s +# assert a.to_s == "i386" + end +end diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/ruby/tests/bytecount.rb new/libzypp-bindings-0.4.7/swig/ruby/tests/bytecount.rb --- old/libzypp-bindings-0.4.6/swig/ruby/tests/bytecount.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/ruby/tests/bytecount.rb 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,25 @@ +# +# Test Bytecount +# + +$:.unshift "../../../build/swig/ruby" + + +# test loading of extension +require 'test/unit' + +class LoadTest < Test::Unit::TestCase + require 'zypp' + include Zypp + + def test_bytecount + g = ByteCount.new(ByteCount.G) + assert g + gb = ByteCount.new(ByteCount.GB) + assert gb + k = ByteCount.new(ByteCount.K) + assert k.to_i == 1024 + mb = ByteCount.new(ByteCount.MB) + assert mb.to_i == 1000*1000 + end +end diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/ruby/tests/CMakeLists.txt new/libzypp-bindings-0.4.7/swig/ruby/tests/CMakeLists.txt --- old/libzypp-bindings-0.4.6/swig/ruby/tests/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/ruby/tests/CMakeLists.txt 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,7 @@ +# +# CMakeLists.txt for libzypp-bindings/swig/ruby/tests +# + +ENABLE_TESTING() + +ADD_TEST(bindings_ruby_loading ruby ${CMAKE_CURRENT_SOURCE_DIR}/loading.rb) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/ruby/tests/loading.rb new/libzypp-bindings-0.4.7/swig/ruby/tests/loading.rb --- old/libzypp-bindings-0.4.6/swig/ruby/tests/loading.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/ruby/tests/loading.rb 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,16 @@ +# +# Test loading of the bindings +# + +$:.unshift "../../../build/swig/ruby" + + +# test loading of extension +require 'test/unit' + +class LoadTest < Test::Unit::TestCase + def test_loading + require 'zypp' + assert true + end +end diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/ruby/tests/starting.rb new/libzypp-bindings-0.4.7/swig/ruby/tests/starting.rb --- old/libzypp-bindings-0.4.6/swig/ruby/tests/starting.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/ruby/tests/starting.rb 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,17 @@ +# +# Test starting of zypp +# + +$:.unshift "../../../build/swig/ruby" + + +# test loading of extension +require 'test/unit' + +class LoadTest < Test::Unit::TestCase + def test_loading + require 'zypp' + zypp = Zypp::ZYppFactory::instance.get_zypp + assert zypp + end +end diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/ruby/tests/target.rb new/libzypp-bindings-0.4.7/swig/ruby/tests/target.rb --- old/libzypp-bindings-0.4.6/swig/ruby/tests/target.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/ruby/tests/target.rb 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1,44 @@ +# +# Example for target +# + +$:.unshift "../../../build/swig/ruby" + + +# test loading of extension +require 'test/unit' + +class LoadTest < Test::Unit::TestCase + require 'zypp' + include Zypp + def test_target + z = ZYppFactory::instance.get_zypp + + assert z.home_path + assert z.tmp_path + + z.initialize_target(Zypp::Pathname.new("/")) + t = z.target + assert t + t.load + t.build_cache + + p = z.pool + assert p + assert p.size > 0 + + # Iterate over pool, gives PoolItems + i = 0 + puts "#{p.size} PoolItems:" + p.each do | pi | + i = i + 1 + break if i > 10 + puts pi + # PoolItems have status and a resolvable +# r = pi.resolvable +# puts "#{r.name}-#{r.edition}" + end + + assert true + end +end diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/ServiceInfo.i new/libzypp-bindings-0.4.7/swig/ServiceInfo.i --- old/libzypp-bindings-0.4.6/swig/ServiceInfo.i 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.4.7/swig/ServiceInfo.i 2008-08-12 21:10:39.000000000 +0200 @@ -0,0 +1 @@ +%include <zypp/ServiceInfo.h> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/Target.i new/libzypp-bindings-0.4.7/swig/Target.i --- old/libzypp-bindings-0.4.6/swig/Target.i 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/Target.i 2008-08-12 21:10:39.000000000 +0200 @@ -1,3 +1,4 @@ +%ignore zypp::Target::reset; %include <zypp/Target.h> namespace zypp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/TranslatedText.i new/libzypp-bindings-0.4.7/swig/TranslatedText.i --- old/libzypp-bindings-0.4.6/swig/TranslatedText.i 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/TranslatedText.i 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ - -%include <zypp/TranslatedText.h> \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/swig/zypp.i new/libzypp-bindings-0.4.7/swig/zypp.i --- old/libzypp-bindings-0.4.6/swig/zypp.i 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/swig/zypp.i 2008-08-12 21:10:39.000000000 +0200 @@ -21,31 +21,28 @@ #include <sstream> #include "zypp/base/PtrTypes.h" +#include "zypp/base/ReferenceCounted.h" #include "zypp/Edition.h" +#include "zypp/Pathname.h" #include "zypp/ResTraits.h" #include "zypp/ZYppFactory.h" #include "zypp/ZYpp.h" -#include "zypp/Pathname.h" -#include "zypp/base/ReferenceCounted.h" -#include "zypp/ResObject.h" + +#include "zypp/ResObjects.h" #include "zypp/Target.h" #include "zypp/target/TargetImpl.h" #include "zypp/MediaSetAccess.h" -#include "zypp/TranslatedText.h" -#include "zypp/Package.h" -#include "zypp/Patch.h" -#include "zypp/SrcPackage.h" -#include "zypp/Pattern.h" -#include "zypp/Product.h" #include "zypp/ResFilters.h" #include "zypp/OnMediaLocation.h" #include "zypp/Repository.h" +#include "zypp/ServiceInfo.h" #include "zypp/RepoManager.h" -#include "zypp/Service.h" #include "zypp/repo/RepoType.h" #include "zypp/TmpPath.h" #include "zypp/Resolver.h" +#include "zypp/Product.h" + using namespace boost; using namespace zypp; using namespace zypp::repo; @@ -102,33 +99,34 @@ %include "IdStringType.i" %include "Pathname.i" +%include "ByteCount.i" %include "Url.i" -%include "ResStatus.i" %include "NeedAType.i" %include "Arch.i" %include "Edition.i" %include "Kind.i" -%include "ResTraits.i" +%include "CheckSum.i" %include "Date.i" +%include "Dep.i" %include "Capability.i" %include "Capabilities.i" -%include "Dep.i" +%include "CapMatch.i" +%include "ResTraits.i" +%include "ResStatus.i" %include "Resolvable.i" -%include "ByteCount.i" -%include "RepoType.i" -%include "Repository.i" -%include "RepoInfo.i" -%include "RepoManager.i" -%include "RepoStatus.i" %include "ResObject.i" -%include "TranslatedText.i" -%include "CheckSum.i" -%include "CapMatch.i" %include "Package.i" %include "Patch.i" -%include "SrcPackage.i" %include "Pattern.i" %include "Product.i" + +%include "SrcPackage.i" +%include "RepoType.i" + + +%include "Repository.i" +%include "RepoStatus.i" +%include "RepoManager.i" %include "PublicKey.i" %include "KeyRing.i" %include "Target.i" @@ -143,5 +141,15 @@ %include "python/callbacks.i" #endif +%ignore zypp::ZYpp::setTextLocale; +%ignore zypp::ZYpp::getTextLocale; +%ignore zypp::ZYpp::setRequestedLocales; +%ignore zypp::ZYpp::getRequestedLocales; +%ignore zypp::ZYpp::getAvailableLocales; +%ignore zypp::ZYpp::architecture; +%ignore zypp::ZYpp::setArchitecture; +%ignore zypp::ZYpp::applyLocks; + %include <zypp/ZYpp.h> + %include "ZYppFactory.i" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.6/VERSION.cmake new/libzypp-bindings-0.4.7/VERSION.cmake --- old/libzypp-bindings-0.4.6/VERSION.cmake 2008-07-25 20:23:18.000000000 +0200 +++ new/libzypp-bindings-0.4.7/VERSION.cmake 2008-08-12 21:10:39.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "4") -SET(VERSION_PATCH "6") +SET(VERSION_PATCH "7") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org