From 7931dacf208613ebea6679c992db44d6e37dee24 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Wed, 22 Aug 2007 10:57:14 +0000 Subject: - renamed ruby module to zypp --- VERSION.cmake | 2 +- examples/ruby/exception.rb | 4 ++-- examples/ruby/list_target_resolvables.rb | 4 ++-- examples/ruby/mediasetaccess_example.rb | 4 ++-- examples/ruby/parse1.rb | 4 ++-- examples/ruby/parse2.rb | 4 ++-- examples/ruby/play_with_pool_and_target.rb | 5 ++--- examples/ruby/play_with_repos.rb | 4 ++-- examples/ruby/test.rb | 4 ++-- examples/ruby/test2.rb | 6 ++---- libzypp-bindings.spec.cmake | 2 +- package/libzypp-bindings.changes | 5 +++++ swig/ruby/CMakeLists.txt | 12 ++++++------ swig/zypp.i | 4 ---- 14 files changed, 31 insertions(+), 33 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 2209c6d..d239824 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "4") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") diff --git a/examples/ruby/exception.rb b/examples/ruby/exception.rb index daddd51..d797698 100644 --- a/examples/ruby/exception.rb +++ b/examples/ruby/exception.rb @@ -1,6 +1,6 @@ -require 'rzypp' -include Rzypp +require 'zypp' +include Zypp tmp_cache_path = TmpDir.new() tmp_raw_cache_path = TmpDir.new() diff --git a/examples/ruby/list_target_resolvables.rb b/examples/ruby/list_target_resolvables.rb index da88a0d..f1d0d9b 100644 --- a/examples/ruby/list_target_resolvables.rb +++ b/examples/ruby/list_target_resolvables.rb @@ -1,6 +1,6 @@ -require 'rzypp' -include Rzypp +require 'zypp' +include Zypp z = ZYppFactory::instance.get_zypp # puts z.class diff --git a/examples/ruby/mediasetaccess_example.rb b/examples/ruby/mediasetaccess_example.rb index 424a387..012eddf 100644 --- a/examples/ruby/mediasetaccess_example.rb +++ b/examples/ruby/mediasetaccess_example.rb @@ -1,6 +1,6 @@ -require 'rzypp' -include Rzypp +require 'zypp' +include Zypp a = MediaSetAccess.new("http://dist.suse.de/install/stable-x86", "/") p = a.provide_file("/content", 1) diff --git a/examples/ruby/parse1.rb b/examples/ruby/parse1.rb index 3288b25..7d60e55 100644 --- a/examples/ruby/parse1.rb +++ b/examples/ruby/parse1.rb @@ -1,6 +1,6 @@ -require 'rzypp' -include Rzypp +require 'zypp' +include Zypp tmp_cache_path = TmpDir.new() tmp_raw_cache_path = TmpDir.new() diff --git a/examples/ruby/parse2.rb b/examples/ruby/parse2.rb index b6240d4..6e08128 100644 --- a/examples/ruby/parse2.rb +++ b/examples/ruby/parse2.rb @@ -1,6 +1,6 @@ -require 'rzypp' -include Rzypp +require 'zypp' +include Zypp tmp_cache_path = TmpDir.new() tmp_raw_cache_path = TmpDir.new() diff --git a/examples/ruby/play_with_pool_and_target.rb b/examples/ruby/play_with_pool_and_target.rb index 945424d..6774b86 100644 --- a/examples/ruby/play_with_pool_and_target.rb +++ b/examples/ruby/play_with_pool_and_target.rb @@ -1,6 +1,6 @@ -require 'rzypp' -include Rzypp +require 'zypp' +include Zypp z = ZYppFactory::instance.get_zypp @@ -18,4 +18,3 @@ p.each do | pi | exit end - diff --git a/examples/ruby/play_with_repos.rb b/examples/ruby/play_with_repos.rb index 5babf55..c7cdf17 100644 --- a/examples/ruby/play_with_repos.rb +++ b/examples/ruby/play_with_repos.rb @@ -1,6 +1,6 @@ -require 'rzypp' -include Rzypp +require 'zypp' +include Zypp a = Arch.new("i386") puts a.to_s diff --git a/examples/ruby/test.rb b/examples/ruby/test.rb index 1ad8b56..4bd1e9a 100644 --- a/examples/ruby/test.rb +++ b/examples/ruby/test.rb @@ -1,6 +1,6 @@ -require 'rzypp' -include Rzypp +require 'zypp' +include Zypp a = Arch.new("i386") puts a.inspect diff --git a/examples/ruby/test2.rb b/examples/ruby/test2.rb index 0056627..ed80741 100644 --- a/examples/ruby/test2.rb +++ b/examples/ruby/test2.rb @@ -1,8 +1,7 @@ -require 'rzypp' +require 'zypp' require 'pathname' - -include Rzypp +include Zypp z = ZYppFactory::instance.get_zypp @@ -16,4 +15,3 @@ puts z.target.class puts t.class #puts t.methods - diff --git a/libzypp-bindings.spec.cmake b/libzypp-bindings.spec.cmake index 3158cae..491e9aa 100644 --- a/libzypp-bindings.spec.cmake +++ b/libzypp-bindings.spec.cmake @@ -53,7 +53,7 @@ Group: Development/Languages/Ruby %files -n ruby-zypp %defattr(-,root,root,-) -%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/rzypp.so +%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/zypp.so %package -n python-zypp Summary: Python bindings for libzypp diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes index 6fa48b0..ac05747 100644 --- a/package/libzypp-bindings.changes +++ b/package/libzypp-bindings.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 22 12:58:05 CEST 2007 - aschnell@suse.de + +- renamed ruby module to zypp + ------------------------------------------------------------------- Fri Aug 17 14:37:06 CEST 2007 - aschnell@suse.de diff --git a/swig/ruby/CMakeLists.txt b/swig/ruby/CMakeLists.txt index 8000506..78108d7 100644 --- a/swig/ruby/CMakeLists.txt +++ b/swig/ruby/CMakeLists.txt @@ -23,14 +23,14 @@ ADD_CUSTOM_TARGET( glue DEPENDS ${SWIG_OUTPUT} ) -ADD_LIBRARY( rzypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) -SET_TARGET_PROPERTIES( rzypp PROPERTIES PREFIX "" ) -ADD_DEPENDENCIES( rzypp glue ) +ADD_LIBRARY( zypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) +SET_TARGET_PROPERTIES( zypp PROPERTIES PREFIX "" ) +ADD_DEPENDENCIES( zypp glue ) INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) -TARGET_LINK_LIBRARIES( rzypp ${ZYPP_LIBRARY} ) -TARGET_LINK_LIBRARIES( rzypp ${RUBY_LIBRARY} ) +TARGET_LINK_LIBRARIES( zypp ${ZYPP_LIBRARY} ) +TARGET_LINK_LIBRARIES( zypp ${RUBY_LIBRARY} ) -INSTALL(TARGETS rzypp LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR} ) +INSTALL(TARGETS zypp LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR}) diff --git a/swig/zypp.i b/swig/zypp.i index c8109bb..722ca3f 100644 --- a/swig/zypp.i +++ b/swig/zypp.i @@ -1,8 +1,4 @@ -#ifdef SWIGRUBY -%module rzypp -#else %module zypp -#endif %{ /* Includes the header in the wrapper code */ -- cgit v1.2.3