Author: aschnell Date: Fri Aug 17 14:47:20 2007 New Revision: 6744 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6744&view=rev Log: - moved ruby files to vendor_ruby Modified: trunk/libzypp-bindings/libzypp-bindings.spec.cmake trunk/libzypp-bindings/package/libzypp-bindings.changes trunk/libzypp-bindings/swig/ruby/CMakeLists.txt trunk/repotools/libzypp-tools.spec.cmake trunk/repotools/package/libzypp-tools.changes trunk/repotools/zypptools/CMakeLists.txt trunk/repotools/zypptools/graph/CMakeLists.txt trunk/repotools/zypptools/input/CMakeLists.txt trunk/repotools/zypptools/lib/CMakeLists.txt trunk/repotools/zypptools/output/CMakeLists.txt Modified: trunk/libzypp-bindings/libzypp-bindings.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/libzypp-bindings.spec.cmake?rev=6744&r1=6743&r2=6744&view=diff ============================================================================== --- trunk/libzypp-bindings/libzypp-bindings.spec.cmake (original) +++ trunk/libzypp-bindings/libzypp-bindings.spec.cmake Fri Aug 17 14:47:20 2007 @@ -53,7 +53,7 @@ %files -n ruby-zypp %defattr(-,root,root,-) -%{_libdir}/ruby/%{rb_ver}/%{rb_arch}/rzypp.so +%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/rzypp.so %package -n python-zypp Summary: Python bindings for libzypp Modified: trunk/libzypp-bindings/package/libzypp-bindings.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/package/libzypp-bindings.changes?rev=6744&r1=6743&r2=6744&view=diff ============================================================================== --- trunk/libzypp-bindings/package/libzypp-bindings.changes (original) +++ trunk/libzypp-bindings/package/libzypp-bindings.changes Fri Aug 17 14:47:20 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 17 14:37:06 CEST 2007 - aschnell@suse.de + +- moved ruby files to vendor_ruby (bug #301127) + +------------------------------------------------------------------- Mon Aug 13 20:46:35 CEST 2007 - aschnell@suse.de - added exceptions Modified: trunk/libzypp-bindings/swig/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ruby/CMakeLists.txt?rev=6744&r1=6743&r2=6744&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/ruby/CMakeLists.txt (original) +++ trunk/libzypp-bindings/swig/ruby/CMakeLists.txt Fri Aug 17 14:47:20 2007 @@ -2,7 +2,10 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") FIND_PACKAGE(Ruby REQUIRED) -MESSAGE( STATUS "Ruby arch dir: ${RUBY_ARCH_DIR}" ) +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['vendorarchdir']" + OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) +STRING(REPLACE "\n" "" RUBY_VENDOR_ARCH_DIR "${RUBY_VENDOR_ARCH_DIR}") +MESSAGE( STATUS "Ruby vendor arch dir: ${RUBY_VENDOR_ARCH_DIR}" ) MESSAGE( STATUS "Ruby include path: ${RUBY_INCLUDE_PATH}" ) SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) @@ -30,5 +33,5 @@ TARGET_LINK_LIBRARIES( rzypp ${ZYPP_LIBRARY} ) TARGET_LINK_LIBRARIES( rzypp ${RUBY_LIBRARY} ) -INSTALL(TARGETS rzypp LIBRARY DESTINATION ${RUBY_ARCH_DIR} ) +INSTALL(TARGETS rzypp LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR} ) Modified: trunk/repotools/libzypp-tools.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/libzypp-tools.spec.cmake?rev=6744&r1=6743&r2=6744&view=diff ============================================================================== --- trunk/repotools/libzypp-tools.spec.cmake (original) +++ trunk/repotools/libzypp-tools.spec.cmake Fri Aug 17 14:47:20 2007 @@ -52,6 +52,6 @@ %files -n ruby-zypptools %defattr(-,root,root,-) -%{_libdir}/ruby/%{rb_ver}/zypptools +%{_libdir}/ruby/vendor_ruby/%{rb_ver}/zypptools %changelog Modified: trunk/repotools/package/libzypp-tools.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/package/libzypp-tools.changes?rev=6744&r1=6743&r2=6744&view=diff ============================================================================== --- trunk/repotools/package/libzypp-tools.changes (original) +++ trunk/repotools/package/libzypp-tools.changes Fri Aug 17 14:47:20 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 17 14:36:33 CEST 2007 - aschnell@suse.de + +- moved ruby files to vendor_ruby (bug #301127) + +------------------------------------------------------------------- Tue Aug 14 16:55:48 CEST 2007 - aschnell@suse.de - initial version with utilities Modified: trunk/repotools/zypptools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/zypptools/CMakeLists.txt?rev=6744&r1=6743&r2=6744&view=diff ============================================================================== --- trunk/repotools/zypptools/CMakeLists.txt (original) +++ trunk/repotools/zypptools/CMakeLists.txt Fri Aug 17 14:47:20 2007 @@ -1,6 +1,9 @@ FIND_PACKAGE(Ruby REQUIRED) -MESSAGE(STATUS "Ruby ruby lib path: ${RUBY_RUBY_LIB_PATH}" ) +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['vendorlibdir']" + OUTPUT_VARIABLE RUBY_VENDOR_LIB_PATH) +STRING(REPLACE "\n" "" RUBY_VENDOR_LIB_PATH "${RUBY_VENDOR_LIB_PATH}") +MESSAGE(STATUS "Ruby vendor lib path: ${RUBY_VENDOR_LIB_PATH}" ) ADD_SUBDIRECTORY(lib) ADD_SUBDIRECTORY(input) Modified: trunk/repotools/zypptools/graph/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/zypptools/graph/CMakeLists.txt?rev=6744&r1=6743&r2=6744&view=diff ============================================================================== --- trunk/repotools/zypptools/graph/CMakeLists.txt (original) +++ trunk/repotools/zypptools/graph/CMakeLists.txt Fri Aug 17 14:47:20 2007 @@ -1,5 +1,5 @@ SET(FILES dependencies.rb edge.rb graph.rb node.rb reason.rb solver.rb) -INSTALL(FILES ${FILES} DESTINATION "${RUBY_RUBY_LIB_PATH}/zypptools/graph") +INSTALL(FILES ${FILES} DESTINATION "${RUBY_VENDOR_LIB_PATH}/zypptools/graph") Modified: trunk/repotools/zypptools/input/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/zypptools/input/CMakeLists.txt?rev=6744&r1=6743&r2=6744&view=diff ============================================================================== --- trunk/repotools/zypptools/input/CMakeLists.txt (original) +++ trunk/repotools/zypptools/input/CMakeLists.txt Fri Aug 17 14:47:20 2007 @@ -2,5 +2,5 @@ SET(FILES contentparser.rb database.rb depend.rb helix.rb patch.rb rpmdir.rb rpmfile.rb tagparser.rb yast.rb yum_filelist.rb) -INSTALL(FILES ${FILES} DESTINATION "${RUBY_RUBY_LIB_PATH}/zypptools/input") +INSTALL(FILES ${FILES} DESTINATION "${RUBY_VENDOR_LIB_PATH}/zypptools/input") Modified: trunk/repotools/zypptools/lib/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/zypptools/lib/CMakeLists.txt?rev=6744&r1=6743&r2=6744&view=diff ============================================================================== --- trunk/repotools/zypptools/lib/CMakeLists.txt (original) +++ trunk/repotools/zypptools/lib/CMakeLists.txt Fri Aug 17 14:47:20 2007 @@ -2,5 +2,5 @@ SET(FILES arch.rb database.rb db.rb dependency.rb hasher.rb package.rb patch.rb pattern.rb product.rb repo.rb resolvable.rb selection.rb) -INSTALL(FILES ${FILES} DESTINATION "${RUBY_RUBY_LIB_PATH}/zypptools/lib") +INSTALL(FILES ${FILES} DESTINATION "${RUBY_VENDOR_LIB_PATH}/zypptools/lib") Modified: trunk/repotools/zypptools/output/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/zypptools/output/CMakeLists.txt?rev=6744&r1=6743&r2=6744&view=diff ============================================================================== --- trunk/repotools/zypptools/output/CMakeLists.txt (original) +++ trunk/repotools/zypptools/output/CMakeLists.txt Fri Aug 17 14:47:20 2007 @@ -2,5 +2,5 @@ SET(FILES database.rb dot.rb helix.rb output.rb patch_helix.rb pdl.rb rpmmd.rb tlp.rb yast.rb yum.rb zypp2_database.rb) -INSTALL(FILES ${FILES} DESTINATION "${RUBY_RUBY_LIB_PATH}/zypptools/output") +INSTALL(FILES ${FILES} DESTINATION "${RUBY_VENDOR_LIB_PATH}/zypptools/output") -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org