Hello community,

here is the log from the commit of package rmt-server for openSUSE:Factory 
checked in at 2018-02-20 17:56:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rmt-server (Old)
 and      /work/SRC/openSUSE:Factory/.rmt-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rmt-server"

Tue Feb 20 17:56:40 2018 rev:5 rq:578277 version:0.0.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/rmt-server/rmt-server.changes    2018-02-14 
10:51:22.110231256 +0100
+++ /work/SRC/openSUSE:Factory/.rmt-server.new/rmt-server.changes       
2018-02-20 17:58:19.479444462 +0100
@@ -1,0 +2,17 @@
+Fri Feb 16 11:20:33 UTC 2018 - tmunta...@suse.com
+
+- Use correct service for systemd timers
+
+-------------------------------------------------------------------
+Fri Feb 16 09:44:26 UTC 2018 - tschm...@suse.com
+
+- RMT on SLE12 also uses ruby 2.5
+  - Removed use-ruby-2.4-in-rails.patch and use-ruby-2.4-in-rmt-cli.patch as
+    they are no longer needed.
+
+-------------------------------------------------------------------
+Wed Feb 14 18:19:19 UTC 2018 - tmunta...@suse.com
+
+- Fixed systemd timers for SLES 12 and Leap
+
+-------------------------------------------------------------------

Old:
----
  use-ruby-2.4-in-rails.patch
  use-ruby-2.4-in-rmt-cli.patch

New:
----
  rmt-server-mirror-sles12.timer
  rmt-server-sync-sles12.timer

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rmt-server.spec ++++++
--- /var/tmp/diff_new_pack.AUyNas/_old  2018-02-20 17:58:20.847395208 +0100
+++ /var/tmp/diff_new_pack.AUyNas/_new  2018-02-20 17:58:20.855394920 +0100
@@ -16,8 +16,8 @@
 #
 
 
-%if (0%{?suse_version} > 0 && 0%{?suse_version} <= 1320) || (0%{?sle_version} 
> 0 && 0%{?sle_version} <= 120300)
-%define use_ruby_2_4 1
+%if 0%{?suse_version} == 1315
+%define is_sle_12_family 1
 %endif
 
 %define app_dir /usr/share/rmt/
@@ -48,39 +48,28 @@
 Source9:        rmt.service
 Source10:       rmt.target
 Source11:       rmt-migration.service
+Source12:       rmt-server-sync-sles12.timer
+Source13:       rmt-server-mirror-sles12.timer
 
-Patch0:         use-ruby-2.4-in-rmt-cli.patch
-Patch1:         use-ruby-2.4-in-rails.patch
-Patch2:         use-ruby-2.5-in-rmt-cli.patch
-Patch3:         use-ruby-2.5-in-rails.patch
+Patch0:         use-ruby-2.5-in-rmt-cli.patch
+Patch1:         use-ruby-2.5-in-rails.patch
 
+BuildRequires:  fdupes
 BuildRequires:  gcc
 BuildRequires:  libcurl-devel
 BuildRequires:  libffi-devel
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
-BuildRequires:  systemd
-%if 0%{?use_ruby_2_4}
-BuildRequires:  ruby2.4
-BuildRequires:  ruby2.4-devel
-BuildRequires:  ruby2.4-rubygem-bundler
-%else
 BuildRequires:  ruby2.5
 BuildRequires:  ruby2.5-devel
 BuildRequires:  ruby2.5-rubygem-bundler
-%endif
-BuildRequires:  fdupes
+BuildRequires:  systemd
 
 Requires:       mariadb
 Requires:       nginx
-%if 0%{?use_ruby_2_4}
-Requires(post): ruby2.4
-Requires(post): ruby2.4-rubygem-bundler
-%else
 Requires(post): ruby2.5
 Requires(post): ruby2.5-rubygem-bundler
-%endif
 Requires(post): timezone
 Requires(post): util-linux
 Requires(post): shadow
@@ -103,20 +92,11 @@
 
 %setup -q
 
-%if 0%{?use_ruby_2_4}
 %patch0 -p1
 %patch1 -p1
-%else
-%patch2 -p1
-%patch3 -p1
-%endif
 
 %build
-%if 0%{?use_ruby_2_4}
-bundle.ruby2.4 install %{?jobs:--jobs %jobs} --without test development 
--deployment --standalone
-%else
 bundle.ruby2.5 install %{?jobs:--jobs %jobs} --without test development 
--deployment --standalone
-%endif
 
 %install
 mkdir -p %{buildroot}%{data_dir}
@@ -138,10 +118,17 @@
 
 # systemd
 mkdir -p %{buildroot}%{_unitdir}
-install -m 444 %{SOURCE5} %{buildroot}%{_unitdir}
+
+%if 0%{?is_sle_12_family}
+install -m 444 %{SOURCE12} %{buildroot}%{_unitdir}/rmt-server-sync.timer
+install -m 444 %{SOURCE13} %{buildroot}%{_unitdir}/rmt-server-mirror.timer
+%else
 install -m 444 %{SOURCE6} %{buildroot}%{_unitdir}
-install -m 444 %{SOURCE7} %{buildroot}%{_unitdir}
 install -m 444 %{SOURCE8} %{buildroot}%{_unitdir}
+%endif
+
+install -m 444 %{SOURCE5} %{buildroot}%{_unitdir}
+install -m 444 %{SOURCE7} %{buildroot}%{_unitdir}
 install -m 444 %{SOURCE9} %{buildroot}%{_unitdir}
 install -m 444 %{SOURCE10} %{buildroot}%{_unitdir}
 install -m 444 %{SOURCE11} %{buildroot}%{_unitdir}
@@ -162,16 +149,9 @@
     %{buildroot}%{app_dir}/.bundle/config
 
 # cleanup of /usr/bin/env commands
-%if 0%{?use_ruby_2_4}
-grep -rl '\/usr\/bin\/env ruby' %{buildroot}%{lib_dir}/vendor/bundle/ruby | 
xargs \
-    sed -i -e's@\/usr\/bin\/env ruby.ruby2\.4@\/usr\/bin\/ruby\.ruby2\.4@g' \
-    -e 's@\/usr\/bin\/env ruby@\/usr\/bin\/ruby\.ruby2\.4@g'
-%else
 grep -rl '\/usr\/bin\/env ruby' %{buildroot}%{lib_dir}/vendor/bundle/ruby | 
xargs \
     sed -i -e 's@\/usr\/bin\/env ruby.ruby2\.5@\/usr\/bin\/ruby\.ruby2\.5@g' \
     -e 's@\/usr\/bin\/env ruby@\/usr\/bin\/ruby\.ruby2\.5@g'
-%endif
-
 grep -rl '\/usr\/bin\/env bash' %{buildroot}%{lib_dir}/vendor/bundle/ruby | 
xargs \
     sed -i -e 's@\/usr\/bin\/env bash@\/bin\/bash@g' \
 

++++++ rmt-server-0.0.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/rmt-server/rmt-server-0.0.3.tar.bz2 
/work/SRC/openSUSE:Factory/.rmt-server.new/rmt-server-0.0.3.tar.bz2 differ: 
char 11, line 1

++++++ rmt-server-mirror-sles12.timer ++++++
[Unit]
Description=RMT Mirror timer
After=rmt.service
Requires=rmt.service

[Timer]
OnCalendar=*-*-* 02:00:00
Unit=rmt-server-mirror.service

[Install]
WantedBy=multi-user.target
++++++ rmt-server-mirror.timer ++++++
--- /var/tmp/diff_new_pack.AUyNas/_old  2018-02-20 17:58:20.995389879 +0100
+++ /var/tmp/diff_new_pack.AUyNas/_new  2018-02-20 17:58:20.999389735 +0100
@@ -6,7 +6,7 @@
 [Timer]
 OnCalendar=*-*-* 02:00:00
 RandomizedDelaySec=3h
-Unit=rmt_mirror.service
+Unit=rmt-server-mirror.service
 
 [Install]
 WantedBy=multi-user.target

++++++ rmt-server-sync-sles12.timer ++++++
[Unit]
Description=RMT Sync timer
After=rmt.service
Requires=rmt.service

[Timer]
OnCalendar=*-*-* 01:00:00
Unit=rmt-server-sync.service

[Install]
WantedBy=multi-user.target
++++++ rmt-server-sync.timer ++++++
--- /var/tmp/diff_new_pack.AUyNas/_old  2018-02-20 17:58:21.079386854 +0100
+++ /var/tmp/diff_new_pack.AUyNas/_new  2018-02-20 17:58:21.079386854 +0100
@@ -6,7 +6,7 @@
 [Timer]
 OnCalendar=*-*-* 01:00:00
 RandomizedDelaySec=3h
-Unit=rmt_sync.service
+Unit=rmt-server-sync.service
 
 [Install]
 WantedBy=multi-user.target

++++++ rmt.8.gz ++++++
--- /var/tmp/diff_new_pack.AUyNas/_old  2018-02-20 17:58:21.123385270 +0100
+++ /var/tmp/diff_new_pack.AUyNas/_new  2018-02-20 17:58:21.135384838 +0100
@@ -14,9 +14,6 @@
 \fBzypper ar \-f 
https://download\.opensuse\.org/repositories/systemsmanagement:/SCC:/RMT/<dist>/systemsmanagement:SCC:RMT\.repo\fR
 .
 .P
-Note that on SLES 12 and openSUSE Leap 42\.2 you will need to add another 
repository which provides ruby 2\.4, like: 
\fBhttps://download\.opensuse\.org/repositories/OBS:/Server:/Unstable/SLE_12_SP3/OBS:Server:Unstable\.repo\fR
-.
-.P
 To install RMT, run: \fBzypper in rmt\-server\fR
 .
 .P
@@ -177,7 +174,7 @@
 The \fBscc\fR section contains your organization credentials for mirroring 
SUSE repositories\. Your organization credentials can be obtained from the SUSE 
Customer Center \fIhttps://scc\.suse\.com/organization\fR\.
 .
 .SH "Dependencies"
-Supported Ruby versions are 2\.4\.1 and newer\.
+Supported Ruby versions are 2\.5\.0 and newer\.
 .
 .SH "Development setup"
 .


Reply via email to