diff --git a/chrony.changes b/chrony.changes index b25d191..6940adc 100644 --- a/chrony.changes +++ b/chrony.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 28 09:35:07 UTC 2016 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Prepare for submission to Factory (see fate#319508) + ------------------------------------------------------------------- Thu Feb 18 16:48:46 UTC 2016 - mrueckert@suse.de diff --git a/chrony.spec b/chrony.spec index d372d6b..8903dc2 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,7 +1,22 @@ # +# spec file for package chrony +# +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +%define vendorzone opensuse. %if 0%{?suse_version} > 1230 || 0%{?rhel_version} > 600 || 0%{?centos_version} > 600 || 0%{?fedora_version} >= 20 || 0%{?el7}%{?fc20}%{?fc21}%{?fc22} %bcond_without systemd %bcond_without syscallfilter @@ -9,15 +24,13 @@ %bcond_with systemd %bcond_with syscallfilter %endif - -%define vendorzone opensuse. Name: chrony Version: 2.3 Release: 0 -License: GPL-2.0+ Summary: System Clock Synchronization Client and Server -Url: http://chrony.tuxfamily.org/ +License: GPL-2.0+ 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 @@ -26,24 +39,30 @@ Source4: chrony.helper Source5: chrony-dnssrv@.service Source6: chrony-dnssrv@.timer # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch: chrony-config.patch +Patch0: chrony-config.patch # add NTP servers from DHCP when starting service Patch1: chrony-service-helper.patch Patch2: chrony-2.2_logrotate.patch -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: NetworkManager-devel BuildRequires: bison BuildRequires: libcap-devel BuildRequires: libedit-devel -%if %{with syscallfilter} -%ifarch %{ix86} x86_64 %{arm} aarch64 -BuildRequires: libseccomp-devel -%endif -%endif BuildRequires: mozilla-nss-devel BuildRequires: pkg-config BuildRequires: texinfo +Requires: logrotate +Requires(pre): %fillup_prereq +Requires(pre): %{_sbindir}/groupadd +Requires(pre): %{_sbindir}/useradd +Requires(pre): %{install_info_prereq} +Recommends: timedatex +# +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with syscallfilter} +%ifarch %ix86 x86_64 %arm aarch64 +BuildRequires: libseccomp-devel +%endif +%endif %if %{with systemd} BuildRequires: pkgconfig(systemd) %{?systemd_requires} @@ -51,13 +70,6 @@ BuildRequires: pkgconfig(systemd) Requires(pre): %insserv_prereq %endif -Requires(pre): %fillup_prereq -Requires(pre): %install_info_prereq -Requires(pre): /usr/sbin/groupadd -Requires(pre): /usr/sbin/useradd -Requires: logrotate -Recommends: timedatex - %description Chrony is a pair of programs which are used to maintain the accuracy of the system clock on a computer. The two programs are called chronyd and chronyc. @@ -76,7 +88,7 @@ as the Chronyd instance it is controlling or a different computer. %prep %setup -q -%patch -p1 +%patch0 -p1 %patch1 -p1 %patch2 -p1 # use our vendor zone (2.*pool.ntp.org names include IPv6 addresses) @@ -105,7 +117,7 @@ make %{?_smp_mflags} all docs gzip -9 -f -n chrony.txt %install -%makeinstall install-docs +make %{?_smp_mflags} DESTDIR=%{buildroot} install install-docs rm -rf "%{buildroot}%{_docdir}/%{name}" mkdir -p %{buildroot}%{_sysconfdir}/{sysconfig,logrotate.d} @@ -140,7 +152,7 @@ echo 'chronyd.service' > \ %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list %else install -D -m0755 "%{SOURCE1}" "%{buildroot}%{_initddir}/chronyd" -ln -s ../../etc/init.d/chronyd "%{buildroot}%{_sbindir}/rcchronyd" +ln -s ../..%{_initddir}/chronyd "%{buildroot}%{_sbindir}/rcchronyd" %endif install -D -m0644 "%{SOURCE2}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.chronyd" @@ -148,12 +160,9 @@ install -m 755 -p %{SOURCE4} %{buildroot}%{_datadir}/chrony-helper touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc} -%clean -rm -rf %{buildroot} - %pre -/usr/sbin/groupadd -r chrony >/dev/null 2>&1 || : -/usr/sbin/useradd -g chrony -s /bin/false -r -c "Chrony Daemon" -d "%{_localstatedir}/lib/chrony" chrony >/dev/null 2>&1 || : +%{_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} %service_add_pre chronyd.service chrony-wait.service @@ -186,9 +195,9 @@ rm -rf %{buildroot} %defattr(-,root,root) %doc FAQ NEWS README chrony.txt* COPYING %doc examples -%config(noreplace) %attr(0640,root,%{name}) %{_sysconfdir}/chrony.conf +%config(noreplace) %attr(0640,root,%{name}) %{_sysconfdir}/chrony.conf %config(noreplace) %attr(0640,root,%{name}) %verify(not md5 size mtime) %{_sysconfdir}/chrony.keys -%config(noreplace) %{_sysconfdir}/logrotate.d/chrony +%config(noreplace) %{_sysconfdir}/logrotate.d/chrony %{_sysconfdir}/NetworkManager/dispatcher.d/20-chrony %dir %{_sysconfdir}/dhcp/ %dir %{_sysconfdir}/dhcp/dhclient.d/ @@ -209,9 +218,9 @@ rm -rf %{buildroot} %endif %{_sbindir}/rcchrony* %{_localstatedir}/adm/fillup-templates/sysconfig.chronyd -%dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony +%dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/drift %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/rtc -%dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony +%dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony %changelog