Hello community, here is the log from the commit of package chrony for openSUSE:Factory checked in at 2017-10-30 21:18:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chrony (Old) and /work/SRC/openSUSE:Factory/.chrony.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chrony" Mon Oct 30 21:18:20 2017 rev:8 rq:536990 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/chrony/chrony.changes 2017-10-02 16:54:57.903979788 +0200 +++ /work/SRC/openSUSE:Factory/.chrony.new/chrony.changes 2017-10-30 21:18:23.419403323 +0100 @@ -1,0 +2,13 @@ +Thu Oct 26 10:39:11 UTC 2017 - [email protected] + +- Cleanup spec file: + * Drop pre systemd support + * Run spec-cleaner + +------------------------------------------------------------------- +Tue Oct 24 18:23:56 UTC 2017 - [email protected] + +- Modified the spec file to comment out the pool statement + in chrony.conf if _not_ building for openSUSE. (bsc#1063704). + +------------------------------------------------------------------- Old: ---- chrony.init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chrony.spec ++++++ --- /var/tmp/diff_new_pack.6CoA53/_old 2017-10-30 21:18:24.307371038 +0100 +++ /var/tmp/diff_new_pack.6CoA53/_new 2017-10-30 21:18:24.311370892 +0100 @@ -18,13 +18,6 @@ %define vendorzone opensuse. %global clknetsim_ver 71dbbc5 -%if 0%{?suse_version} > 1230 -%bcond_without systemd -%bcond_without syscallfilter -%else -%bcond_with systemd -%bcond_with syscallfilter -%endif Name: chrony Version: 3.2 Release: 0 @@ -33,7 +26,6 @@ Group: Productivity/Networking/Other Url: http://chrony.tuxfamily.org/ Source: http://download.tuxfamily.org/chrony/chrony-%{version}.tar.gz -Source1: chrony.init Source2: chrony.sysconfig Source3: chrony.dhclient Source4: chrony.helper @@ -47,7 +39,6 @@ Patch1: chrony-service-helper.patch Patch2: chrony-logrotate.patch Patch5: chrony-fix-open.patch -# BuildRequires: NetworkManager-devel BuildRequires: bison BuildRequires: gcc-c++ @@ -58,25 +49,17 @@ # The timezone package is needed for the "make check" tests. It can be # removed if the call to make check is ever deleted. BuildRequires: timezone +BuildRequires: pkgconfig(systemd) Requires: logrotate Requires(pre): %fillup_prereq Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd Provides: ntp-daemon -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{with syscallfilter} %ifarch s390 s390x ppc64le BuildRequires: libseccomp-devel >= 2.2.0 %else BuildRequires: libseccomp-devel %endif -%endif -%if %{with systemd} -BuildRequires: pkgconfig(systemd) -%{?systemd_requires} -%else -Requires(pre): %insserv_prereq -%endif %description Chrony is an implementation of the Network Time Protocol (NTP). It can @@ -107,9 +90,16 @@ %patch2 -p1 %patch5 -p1 -# use our vendor zone (2.*pool.ntp.org names include IPv6 addresses) +# If this is an openSUSE build, use our vendor zone +# (2.*pool.ntp.org names include IPv6 addresses). If not +# an openSUSE build, comment out the pool statement +%if 0%{?is_opensuse} sed -e 's|^\(pool \)\(pool.ntp.org\)|\12.%{vendorzone}\2|' \ < examples/chrony.conf.example2 > chrony.conf +%else +sed -e 's|^\pool|! pool|' \ + < examples/chrony.conf.example2 > chrony.conf +%endif touch -r examples/chrony.conf.example2 chrony.conf @@ -130,90 +120,67 @@ --with-user=chrony \ --with-hwclockfile=%{_sysconfdir}/adjtime \ --with-sendmail=%{_sbindir}/sendmail - make %{?_smp_mflags} all docs %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install - -mkdir -p %{buildroot}%{_sysconfdir}/{sysconfig,logrotate.d} -mkdir -p %{buildroot}%{_localstatedir}/{lib,log}/chrony -mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d -mkdir -p %{buildroot}%{_sysconfdir}/dhcp/dhclient.d -mkdir -p %{buildroot}%{_datadir} -mkdir -p %{buildroot}{%{_unitdir},%{_prefix}/lib/systemd/ntp-units.d} - -install -m 644 -p chrony.conf %{buildroot}%{_sysconfdir}/chrony.conf - -install -m 640 -p examples/chrony.keys.example \ +%make_install +install -Dpm 0644 chrony.conf \ + %{buildroot}%{_sysconfdir}/chrony.conf +install -Dpm 0640 examples/chrony.keys.example \ %{buildroot}%{_sysconfdir}/chrony.keys -install -m 755 -p examples/chrony.nm-dispatcher \ +install -Dpm 0755 examples/chrony.nm-dispatcher \ %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/20-chrony -install -m 755 -p %{SOURCE3} \ +install -Dpm 0755 %{SOURCE3} \ %{buildroot}%{_sysconfdir}/dhcp/dhclient.d/chrony.sh -install -m 644 -p examples/chrony.logrotate \ +install -Dpm 0644 examples/chrony.logrotate \ %{buildroot}%{_sysconfdir}/logrotate.d/chrony - -%if %{with systemd} -install -m 644 -p examples/chronyd.service \ +install -Dpm 0644 examples/chronyd.service \ %{buildroot}%{_unitdir}/chronyd.service -install -m 644 -p examples/chrony-wait.service \ +install -Dpm 0644 examples/chrony-wait.service \ %{buildroot}%{_unitdir}/chrony-wait.service -install -m 644 -p %{SOURCE5} %{buildroot}%{_unitdir}/[email protected] -install -m 644 -p %{SOURCE6} %{buildroot}%{_unitdir}/[email protected] -ln -s %{_sbindir}/service "%{buildroot}%{_sbindir}/rcchronyd" -ln -s %{_sbindir}/service "%{buildroot}%{_sbindir}/rcchrony-wait" +install -Dpm 0644 %{SOURCE5} \ + %{buildroot}%{_unitdir}/[email protected] +install -Dpm 0644 %{SOURCE6} \ + %{buildroot}%{_unitdir}/[email protected] + +install -d %{buildroot}%{sbindir} +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchronyd +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchrony-wait +install -d %{buildroot}%{_prefix}/lib/systemd/ntp-units.d echo 'chronyd.service' > \ %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list -%else -install -D -m0755 "%{SOURCE1}" "%{buildroot}%{_initddir}/chronyd" -ln -s ../..%{_initddir}/chronyd "%{buildroot}%{_sbindir}/rcchronyd" -%endif -install -D -m0644 "%{SOURCE2}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.chronyd" -install -m 755 -p %{SOURCE4} %{buildroot}%{_datadir}/chrony-helper +install -Dpm 0644 %{SOURCE2} \ + %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.chronyd +install -Dpm 755 %{SOURCE4} \ + %{buildroot}%{_datadir}/chrony-helper +install -d %{buildroot}%{_localstatedir}/log/chrony touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc} %check # Set random seed to get deterministic results export CLKNETSIM_RANDOM_SEED=24501 make %{?_smp_mflags} -C test/simulation/clknetsim - -make check +make %{?_smp_mflags} check %pre -%{_sbindir}/groupadd -r chrony >/dev/null 2>&1 || : -%{_sbindir}/useradd -g chrony -s /bin/false -r -c "Chrony Daemon" -d "%{_localstatedir}/lib/chrony" chrony >/dev/null 2>&1 || : -# START BIG SYSTEMD -%if %{with systemd} +getent group %{name} >/dev/null || groupadd -r %{name} +getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/lib/chrony" -s /bin/false -c "Chrony Daemon" %{name} %service_add_pre chronyd.service chrony-wait.service -%endif %preun -%if %{with systemd} %service_del_preun chronyd.service chrony-wait.service -%else -%stop_on_removal chronyd -%endif %post %fillup_only %{name} -%if %{with systemd} %service_add_post chronyd.service chrony-wait.service -%endif %postun -%if %{with systemd} %service_del_postun chronyd.service chrony-wait.service -%else -%restart_on_update chronyd -%insserv_cleanup -%endif %files -%defattr(-,root,root) %doc FAQ NEWS README COPYING %doc examples %config(noreplace) %attr(0640,root,%{name}) %{_sysconfdir}/chrony.conf @@ -229,13 +196,9 @@ %{_mandir}/man1/chronyc.1%{ext_man} %{_mandir}/man5/chrony.conf.5%{ext_man} %{_mandir}/man8/chronyd.8%{ext_man} -%if %{with systemd} %{_prefix}/lib/systemd/ntp-units.d/*.list %{_unitdir}/chrony*.service %{_unitdir}/chrony*.timer -%else -%config %{_sysconfdir}/init.d/chronyd -%endif %{_sbindir}/rcchrony* %{_localstatedir}/adm/fillup-templates/sysconfig.chronyd %dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony
