Hello community,
here is the log from the commit of package ruby2.5 for openSUSE:Factory checked
in at 2017-09-24 11:41:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ruby2.5 (Old)
and /work/SRC/openSUSE:Factory/.ruby2.5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ruby2.5"
Sun Sep 24 11:41:41 2017 rev:2 rq:528435 version:2.5.0~svn.596232
Changes:
--------
--- /work/SRC/openSUSE:Factory/ruby2.5/ruby2.5.changes 2017-09-13
22:33:20.858163242 +0200
+++ /work/SRC/openSUSE:Factory/.ruby2.5.new/ruby2.5.changes 2017-09-24
11:41:43.707674482 +0200
@@ -1,0 +2,18 @@
+Fri Sep 22 15:37:46 UTC 2017 - mrueck...@suse.de
+
+- make it easier to sync the versions from the gemspec with the
+ spec file:
+ ruby dump-versions.rb $unpacked_tarball_dir
+
+-------------------------------------------------------------------
+Fri Sep 22 14:54:24 UTC 2017 - mrueck...@suse.de
+
+- add conflicts for all intree gems
+
+-------------------------------------------------------------------
+Mon Sep 11 15:42:29 UTC 2017 - jeng...@inai.de
+
+- Fix RPM groups. Replace old RPM macros by modern ones.
+- Ensure neutrality of descriptions.
+
+-------------------------------------------------------------------
New:
----
dump-versions.rb
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ruby2.5.spec ++++++
--- /var/tmp/diff_new_pack.g4sIf5/_old 2017-09-24 11:41:44.579551610 +0200
+++ /var/tmp/diff_new_pack.g4sIf5/_new 2017-09-24 11:41:44.579551610 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ruby2.4
+# spec file for package ruby2.5
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
@@ -66,10 +66,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: libtool
BuildRequires: awk
BuildRequires: gdbm-devel
BuildRequires: libffi-devel
+BuildRequires: libtool
BuildRequires: libyaml-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
@@ -113,9 +113,10 @@
# Source:
http://cache.ruby-lang.org/pub/ruby/2.5/ruby-%{version}.tar.xz
Source: https://cache.ruby-lang.org/pub/ruby/snapshot.tar.gz
Source1: generate_rubygemprovides.awk
+Source2: dump-versions.rb
#
-Source2: %{name}.macros
-Source3: %{name}-default.macros
+Source3: %{name}.macros
+Source4: %{name}-default.macros
Source99: %{name}-rpmlintrc
Patch01: 0001-make-gem-build-reproducible.patch
@@ -127,10 +128,10 @@
Group: Development/Languages/Ruby
%description
-Ruby is an interpreted scripting language for quick and easy
+Ruby is an interpreted scripting language for
object-oriented programming. It has many features for processing text
files and performing system management tasks (as in Perl). It is
-simple, straight-forward, and extensible.
+extensible.
* Ruby features:
@@ -152,19 +153,16 @@
- Dynamic Loading of Object Files (on some architectures)
-- Highly Portable (works on many UNIX machines; DOS, Windows, Mac,
-BeOS, and more)
-
%package -n %{libname}
Summary: Dynamic runtime library for Ruby
Group: System/Libraries
%description -n %{libname}
-Dynamic runtime library libruby2.1.so.2.0.0 for Ruby
+Dynamic runtime library libruby2.5.so.2.5.0 for Ruby
%package doc
Summary: Documentation and samples for Ruby
-Group: Development/Languages/Ruby
+Group: Documentation/Other
%description doc
Documentation and samples for Ruby
@@ -185,33 +183,36 @@
%define gen_embedded_provides4() %(awk -f %{S:1} -- %api_version %arch %1 %2
%3 %4)
%define gen_embedded_provides5() %(awk -f %{S:1} -- %api_version %arch %1 %2
%3 %4 %5)
-# gemspec
%gen_embedded_provides4 bigdecimal 1 3 2
-%gen_embedded_provides4 csv 0 0 1
-%gen_embedded_provides4 cmath 0 0 1
%gen_embedded_provides4 date 0 0 1
%gen_embedded_provides4 dbm 0 5 1
+%gen_embedded_provides4 digest 0 1 0
+%gen_embedded_provides4 etc 0 2 1
%gen_embedded_provides4 fcntl 0 0 1
-%gen_embedded_provides4 fileutils 0 7 2
+%gen_embedded_provides5 fiddle 1 0 0 beta1
+%gen_embedded_provides5 gdbm 2 0 0 beta1
%gen_embedded_provides4 io-console 0 4 6
-%gen_embedded_provides4 json 2 0 2
-%gen_embedded_provides4 openssl 2 0 4
+%gen_embedded_provides4 json 2 1 0
+%gen_embedded_provides4 openssl 2 0 5
%gen_embedded_provides5 psych 3 0 0 beta3
-%gen_embedded_provides4 rdoc 5 1 0
-%gen_embedded_provides4 scanf 0 0 1
-%gen_embedded_provides4 sdbm 0 5 1
+%gen_embedded_provides4 sdbm 0 0 1
%gen_embedded_provides4 stringio 0 0 1
%gen_embedded_provides4 strscan 0 0 1
-%gen_embedded_provides5 webrick 1 4 0 beta1
%gen_embedded_provides4 zlib 0 0 1
-# gems
%gen_embedded_provides4 did_you_mean 1 1 2
%gen_embedded_provides4 minitest 5 10 2
%gen_embedded_provides4 net-telnet 0 1 1
-%gen_embedded_provides4 power_assert 1 0 2
+%gen_embedded_provides4 power_assert 1 1 0
%gen_embedded_provides4 rake 12 0 0
%gen_embedded_provides4 test-unit 3 2 4
%gen_embedded_provides4 xmlrpc 0 3 0
+%gen_embedded_provides4 cmath 0 0 1
+%gen_embedded_provides4 csv 0 0 1
+%gen_embedded_provides4 fileutils 0 7 2
+%gen_embedded_provides4 ipaddr 1 0 0
+%gen_embedded_provides4 rdoc 4 1 0
+%gen_embedded_provides4 scanf 0 0 1
+%gen_embedded_provides4 webrick 1 3 1
################################
@@ -220,7 +221,7 @@
%package devel
Summary: Development files to link against Ruby
-Group: Development/Languages/Ruby
+Group: Development/Languages/C and C++
Requires: %{name} = %{version}
Provides: rubygems = 2.5.2
Provides: rubygems_with_buildroot_patch
@@ -230,7 +231,7 @@
%package devel-extra
Summary: Special development files of ruby, normally not installed
-Group: Development/Languages/Ruby
+Group: Development/Languages/C and C++
Requires: %{name}-devel = %{version}
%description devel-extra
@@ -238,7 +239,7 @@
%package doc-ri
Summary: Ruby Interactive Documentation
-Group: Development/Languages/Ruby
+Group: Documentation/Other
Requires: %{name} = %{version}
%if 0%{?suse_version} >= 1121
BuildArch: noarch
@@ -249,7 +250,7 @@
%package doc-html
Summary: This package contains the HTML docs for ruby
-Group: Development/Languages/Ruby
+Group: Documentation/HTML
Requires: %{name} = %{version}
%if 0%{?suse_version} >= 1121
BuildArch: noarch
@@ -278,10 +279,10 @@
%endif
%description test-suite
-Ruby is an interpreted scripting language for quick and easy
+Ruby is an interpreted scripting language for
object-oriented programming. It has many features for processing text
files and performing system management tasks (as in Perl). It is
-simple, straight-forward, and extensible.
+extensible.
* Ruby features:
@@ -303,9 +304,6 @@
- Dynamic Loading of Object Files (on some architectures)
-- Highly Portable (works on many UNIX machines; DOS, Windows, Mac,
-BeOS, and more)
-
%prep
#setup -q -n ruby-%{version}
%setup -q -n snapshot
@@ -332,10 +330,10 @@
--enable-shared \
--disable-static \
--disable-rpath
-%{__make} all V=1
+make all V=1
%install
-%makeinstall V=1
+%make_install V=1
echo "%defattr(-,root,root,-)" > devel-extra-excludes
echo "%defattr(-,root,root,-)" > devel-extra-list
for i in iseq.h insns.inc insns_info.inc revision.h version.h
thread_pthread.h \
@@ -413,11 +411,8 @@
make check V=1 $DISABLE_TESTS ||:
%endif
-%post -n %{libname}
-/sbin/ldconfig
-
-%postun -n %{libname}
-/sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
++++++ dump-versions.rb ++++++
#!/usr/bin/ruby
dir = ARGV.first || './'
Dir[File.join(dir, '**/*.gemspec')].sort.each do |gemspec_path|
next if /(test|spec)\// =~ gemspec_path
# $stderr.puts "Handling #{gemspec_path}"
gemspec = Gem::Specification.load(gemspec_path)
version_split = gemspec.version.segments
if gemspec.version.prerelease?
version_split = version_split.slice(0,3) << version_split.slice(-2,2).join()
end
macro = version_split.length > 3 ? '%gen_embedded_provides5' :
'%gen_embedded_provides4'
puts "#{macro} #{gemspec.name} #{version_split.join(" ")}"
end
++++++ generate_rubygemprovides.awk ++++++
--- /var/tmp/diff_new_pack.g4sIf5/_old 2017-09-24 11:41:44.635543719 +0200
+++ /var/tmp/diff_new_pack.g4sIf5/_new 2017-09-24 11:41:44.639543156 +0200
@@ -40,6 +40,10 @@
print "Provides: rubygem(ruby:" rbver ":" name ":" major "." minor "." micro
") = " version
if (tiny != "") {
print "Provides: rubygem(ruby:" rbver ":" name ":" major "." minor "."
micro "." tiny ") = " version
+ print "Conflicts: otherproviders(rubygem(ruby:" rbver ":" name ":" major
"." minor "." micro "." tiny "))"
+ }
+ else {
+ print "Conflicts: otherproviders(rubygem(ruby:" rbver ":" name ":" major
"." minor "." micro "))"
}
print "Provides: rubygem(ruby:" rbver ":" name ":" version ") = " version
print "Provides: rubygem(" name ") = " version
