Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in at 2014-05-02 20:52:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ntp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2014-04-05 14:43:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2014-05-02 20:52:28.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Apr 29 13:24:32 UTC 2014 - max@suse.com
+
+- Remove /var/run/ntp from the package:
+ http://lists.opensuse.org/opensuse-packaging/2014-04/msg00046.html
+- Fix Provides/Obsoletes of package aliases.
+- Add /usr/sbin/rc* links.
+- Stay enabled across sysv to systemd migrations (bnc#875490).
+
+-------------------------------------------------------------------
+Sat Apr 19 17:16:36 UTC 2014 - seife+obs@b1-systems.com
+
+- fix "start-ntp addserver": start-ntp has no "status" method
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ntp.spec ++++++
--- /var/tmp/diff_new_pack.1j3K1U/_old 2014-05-02 20:52:29.000000000 +0200
+++ /var/tmp/diff_new_pack.1j3K1U/_new 2014-05-02 20:52:29.000000000 +0200
@@ -72,10 +72,10 @@
Patch20: ntp-sntp-recverr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ntp-daemon
-Provides: xntp <= 4.2.4p6
-Provides: xntp3
-Obsoletes: xntp <= 4.2.4p5
-Obsoletes: xntp3
+Provides: xntp = %version
+Provides: xntp3 = %version
+Obsoletes: xntp < %version
+Obsoletes: xntp3 < %version
Conflicts: openntpd
PreReq: pwdutils %fillup_prereq /usr/bin/diff /usr/bin/grep /sbin/chkconfig
Suggests: logrotate
@@ -134,12 +134,12 @@
Ulrich Windl
%package doc
-Provides: ntpdoc
-Provides: xntp-doc = 4.2.4
-Provides: xntpdoc
-Obsoletes: ntpdoc
-Obsoletes: xntp-doc <= 4.2.4
-Obsoletes: xntpdoc
+Provides: ntpdoc = %version
+Provides: xntp-doc = %version
+Provides: xntpdoc = %version
+Obsoletes: ntpdoc < %version
+Obsoletes: xntp-doc < %version
+Obsoletes: xntpdoc < %version
Summary: Additional Package Documentation for ntp
Group: Documentation/Other
@@ -266,7 +266,8 @@
%__install -d %{buildroot}/var/lib/ntp/{drift,etc,var/{lib,run/ntp},dev}
%__install -d %{buildroot}/var/run
ln -s ../.. %{buildroot}/var/lib/ntp/var/lib/ntp
-ln -s ../lib/ntp/var/run/ntp %{buildroot}/var/run
+ln -s /usr/sbin/service %buildroot/usr/sbin/rcntpd
+ln -s /usr/sbin/service %buildroot/usr/sbin/rcntp-wait
%__install -m 644 -D %{S:1} %{buildroot}/etc/logrotate.d/ntp
%__install -m 600 -D %{S:2} %{buildroot}/etc/ntp.conf
%__install -m 600 -D %{S:2} %{buildroot}/var/lib/ntp/etc/ntp.conf.iburst
@@ -322,8 +323,11 @@
/usr/sbin/useradd -r -o -g ntp -u 74 -s /bin/false -c "NTP daemon" -d /var/lib/ntp ntp 2> /dev/null || :
/usr/sbin/usermod -g ntp ntp 2>/dev/null || :
test -L /var/run/ntp || rm -rf /var/run/ntp && :
-%service_add_pre ntpd.service
+%service_add_pre ntp.service ntpd.service
%service_add_pre ntp-wait.service
+if [ $FIRST_ARG -ne 1 -a ! -e "/var/lib/systemd/migrated/ntpd" ]; then
+ sed -i -e 's,ntp\t,ntpd\t,g' /var/lib/systemd/sysv-convert/database
+fi
%preun
%service_del_preun ntpd.service
@@ -376,6 +380,9 @@
fi
%service_add_post ntpd.service
%service_add_post ntp-wait.service
+if [ ! -e "/var/lib/systemd/migrated/ntpd" ]; then
+ touch /var/lib/systemd/migrated/ntpd
+fi
%postun
%service_del_postun ntpd.service
@@ -403,7 +410,6 @@
%{_mandir}/man8/*
/var/adm/fillup-templates/*
%attr(0755,ntp,root) /var/lib/ntp/var/run/ntp
-%ghost /var/run/ntp
%ghost %config(noreplace) /var/log/ntp
/usr/share/omc/svcinfo.d/ntp.xml
++++++ conf.start-ntpd ++++++
--- /var/tmp/diff_new_pack.1j3K1U/_old 2014-05-02 20:52:29.000000000 +0200
+++ /var/tmp/diff_new_pack.1j3K1U/_new 2014-05-02 20:52:29.000000000 +0200
@@ -95,7 +95,7 @@
test -e /var/run/ntp || ln -s /var/lib/ntp/var/run/ntp /var/run
function ntpd_is_running() {
- $0 status >/dev/null
+ service ntp status >/dev/null
}
function parse_symlink() {
@@ -195,7 +195,7 @@
fi
shift
- $0 status 2>&1 >/dev/null
+ service ntp status 2>&1 >/dev/null
if test $? = 0;
then
add_runtime_server "$@"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org