Hello community,
here is the log from the commit of package yast2-ruby-bindings for
openSUSE:Factory checked in at 2017-11-30 12:35:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-ruby-bindings (Old)
and /work/SRC/openSUSE:Factory/.yast2-ruby-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ruby-bindings"
Thu Nov 30 12:35:32 2017 rev:85 rq:544638 version:4.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ruby-bindings/yast2-ruby-bindings.changes
2017-09-27 16:53:25.679317000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-ruby-bindings.new/yast2-ruby-bindings.changes
2017-11-30 12:35:32.895392136 +0100
@@ -1,0 +2,7 @@
+Thu Nov 23 09:45:04 UTC 2017 - [email protected]
+
+- Hardcode the Ruby version in the y2start script to always use
+ the Ruby version used at the build time (bsc#1068863)
+- 4.0.1
+
+-------------------------------------------------------------------
Old:
----
yast2-ruby-bindings-4.0.0.tar.bz2
New:
----
yast2-ruby-bindings-4.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ruby-bindings.spec ++++++
--- /var/tmp/diff_new_pack.aJ1GSY/_old 2017-11-30 12:35:33.407373520 +0100
+++ /var/tmp/diff_new_pack.aJ1GSY/_new 2017-11-30 12:35:33.411373375 +0100
@@ -17,7 +17,7 @@
Name: yast2-ruby-bindings
-Version: 4.0.0
+Version: 4.0.1
Release: 0
Url: https://github.com/yast/yast-ruby-bindings
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-ruby-bindings-4.0.0.tar.bz2 -> yast2-ruby-bindings-4.0.1.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ruby-bindings-4.0.0/cmake/modules/FindRuby.cmake
new/yast2-ruby-bindings-4.0.1/cmake/modules/FindRuby.cmake
--- old/yast2-ruby-bindings-4.0.0/cmake/modules/FindRuby.cmake 2017-09-26
15:29:18.614663821 +0200
+++ new/yast2-ruby-bindings-4.0.1/cmake/modules/FindRuby.cmake 2017-11-23
15:33:45.490444639 +0100
@@ -15,7 +15,7 @@
set(RUBY_FIND_QUIETLY TRUE)
endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
-FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.9 ruby19 ruby1.9.1 ruby2.1)
+FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby)
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print
RbConfig::CONFIG['archdir']"
OUTPUT_VARIABLE RUBY_ARCH_DIR)
@@ -46,6 +46,10 @@
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print
RbConfig::CONFIG['arch']"
OUTPUT_VARIABLE RUBY_ARCH)
+# RUBY_BIN_PATH contains the full path including the version suffix,
+# e.g. /usr/bin/ruby.ruby2.4
+EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig.ruby"
+ OUTPUT_VARIABLE RUBY_BIN_PATH)
FIND_PATH(RUBY_INCLUDE_PATH
NAMES ruby.h
@@ -54,7 +58,7 @@
)
FIND_LIBRARY(RUBY_LIBRARY
- NAMES ruby ruby1.9 ruby-1.9.1 ruby2.1 ruby-2.1
+ NAMES ruby
PATHS ${RUBY_POSSIBLE_LIB_PATH}
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ruby-bindings-4.0.0/package/yast2-ruby-bindings.changes
new/yast2-ruby-bindings-4.0.1/package/yast2-ruby-bindings.changes
--- old/yast2-ruby-bindings-4.0.0/package/yast2-ruby-bindings.changes
2017-09-26 15:29:18.622663821 +0200
+++ new/yast2-ruby-bindings-4.0.1/package/yast2-ruby-bindings.changes
2017-11-23 15:33:45.502444639 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Nov 23 09:45:04 UTC 2017 - [email protected]
+
+- Hardcode the Ruby version in the y2start script to always use
+ the Ruby version used at the build time (bsc#1068863)
+- 4.0.1
+
+-------------------------------------------------------------------
Tue Sep 26 13:20:14 UTC 2017 - [email protected]
- Nicer backtrace output in log for internal errors (help for
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ruby-bindings-4.0.0/package/yast2-ruby-bindings.spec
new/yast2-ruby-bindings-4.0.1/package/yast2-ruby-bindings.spec
--- old/yast2-ruby-bindings-4.0.0/package/yast2-ruby-bindings.spec
2017-09-26 15:29:18.622663821 +0200
+++ new/yast2-ruby-bindings-4.0.1/package/yast2-ruby-bindings.spec
2017-11-23 15:33:45.502444639 +0100
@@ -17,7 +17,7 @@
Name: yast2-ruby-bindings
-Version: 4.0.0
+Version: 4.0.1
Url: https://github.com/yast/yast-ruby-bindings
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ruby-bindings-4.0.0/src/CMakeLists.txt
new/yast2-ruby-bindings-4.0.1/src/CMakeLists.txt
--- old/yast2-ruby-bindings-4.0.0/src/CMakeLists.txt 2017-09-26
15:29:18.634663821 +0200
+++ new/yast2-ruby-bindings-4.0.1/src/CMakeLists.txt 2017-11-23
15:33:45.502444639 +0100
@@ -1,6 +1,11 @@
add_subdirectory(ruby)
add_subdirectory(binary)
-
-
install(PROGRAMS y2start/y2start DESTINATION lib/YaST2/bin)
+
+# hardcode the ruby version in the y2start script (bsc#1068863)
+# use bash -c to expand $DESTDIR
+install(CODE "execute_process(COMMAND bash -c \"echo Updating
$DESTDIR${CMAKE_INSTALL_PREFIX}/lib/YaST2/bin/y2start:\")")
+# replace the first line in y2start with a new hashbang
+install(CODE "execute_process(COMMAND bash -c \"sed -i '1 s@^.*$@\\#!
${RUBY_BIN_PATH}@' $DESTDIR${CMAKE_INSTALL_PREFIX}/lib/YaST2/bin/y2start\")")
+install(CODE "execute_process(COMMAND bash -c \"head -n1
$DESTDIR${CMAKE_INSTALL_PREFIX}/lib/YaST2/bin/y2start\")")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ruby-bindings-4.0.0/src/y2start/y2start
new/yast2-ruby-bindings-4.0.1/src/y2start/y2start
--- old/yast2-ruby-bindings-4.0.0/src/y2start/y2start 2017-09-26
15:29:18.734663821 +0200
+++ new/yast2-ruby-bindings-4.0.1/src/y2start/y2start 2017-11-23
15:33:45.622444639 +0100
@@ -1,4 +1,6 @@
#! /usr/bin/ruby
+# Note: The ruby interpreter path above is replaced at the installation
+# to use a hardcoded versioned path.
# set env as first part, otherwise dummy UI will be created.
# for insts-sys it will be overwritten later
