Hello community, here is the log from the commit of package ntpsec for openSUSE:Factory checked in at 2017-12-01 15:53:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ntpsec (Old) and /work/SRC/openSUSE:Factory/.ntpsec.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ntpsec" Fri Dec 1 15:53:57 2017 rev:7 rq:546706 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ntpsec/ntpsec.changes 2017-11-25 08:44:18.974634863 +0100 +++ /work/SRC/openSUSE:Factory/.ntpsec.new/ntpsec.changes 2017-12-01 15:54:12.122819527 +0100 @@ -1,0 +2,5 @@ +Tue Nov 28 15:40:51 UTC 2017 - mpluskal@suse.com + +- Switch to python3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntpsec.spec ++++++ --- /var/tmp/diff_new_pack.am37vo/_old 2017-12-01 15:54:24.646368865 +0100 +++ /var/tmp/diff_new_pack.am37vo/_new 2017-12-01 15:54:24.646368865 +0100 @@ -17,11 +17,6 @@ # -%if 0%{?suse_version} >= 1320 || 0%{?is_opensuse} -%bcond_without libbsd -%else -%bcond_with libbsd -%endif Name: ntpsec Version: 1.0.0 Release: 0 @@ -48,9 +43,10 @@ BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: pps-tools-devel +BuildRequires: pkgconfig(libbsd) BuildRequires: pkgconfig(libevent) BuildRequires: pkgconfig(libseccomp) -BuildRequires: pkgconfig(python2) +BuildRequires: pkgconfig(python3) Requires: netcfg Requires: ntpsec-utils Requires(pre): pwdutils @@ -59,21 +55,16 @@ Recommends: wget Conflicts: otherproviders(ntp-daemon) Provides: ntp-daemon -%if %{with libbsd} -BuildRequires: pkgconfig(libbsd) -%endif %description A more secure implementation of NTP, derived from NTP Classic, Dave Mills’s original. -%package -n python2-ntp +%package -n python3-ntp Summary: Python ntpsec bindings Group: Development/Languages/Python -Provides: python-ntp = %{version} -Obsoletes: python-ntp < %{version} -%description -n python2-ntp +%description -n python3-ntp The ntpsec python bindings used by various ntp utilities. %package utils @@ -81,10 +72,10 @@ Group: System/Base Requires: %{name} = %{version} # For ntploggps -Requires: python2-gpsd -Requires: python2-ntp +Requires: python3-gpsd +Requires: python3-ntp # For ntpviz -Recommends: python2-psutil +Recommends: python3-psutil # Same binaries Conflicts: ntp @@ -94,7 +85,7 @@ %prep %setup -q # Fix python shebangs -sed -i -e 's:#!%{_bindir}/env python:#!%{_bindir}/python2:' \ +sed -i -e 's:#!%{_bindir}/env python:#!%{_bindir}/python3:' \ ntpclients/* %build @@ -103,14 +94,14 @@ export CFLAGS="%{optflags}" export CCFLAGS="%{optflags}" -python2 ./waf configure \ +python3 ./waf configure \ --build-epoch="$epoch" \ --enable-debug \ --prefix=%{_prefix} \ --mandir="%{_mandir}" \ - --python=%{_bindir}/python2 \ - --pythonarchdir=%{python_sitearch} \ - --pythondir=%{python_sitearch} \ + --python=%{_bindir}/python3 \ + --pythonarchdir=%{python3_sitearch} \ + --pythondir=%{python3_sitearch} \ --enable-seccomp \ --enable-debug-gdb \ --enable-early-droproot \ @@ -118,28 +109,28 @@ --enable-mssntp \ --enable-lockclock \ --refclock=all -python2 ./waf build --verbose %{?_smp_mflags} +python3 ./waf build --verbose %{?_smp_mflags} %install -python2 ./waf install --destdir=%{buildroot} +python3 ./waf install --destdir=%{buildroot} # Use correct path in unit file sed -i "s|bin|sbin|g" etc/ntpd.service # FIXME: As long as systemdenable switch for install is broken -install -m 0644 -D etc/ntpd.service %{buildroot}/%{_unitdir}/ntpd.service -install -m 0644 -D etc/ntp-wait.service %{buildroot}/%{_unitdir}/ntp-wait.service +install -pm 0644 -D etc/ntpd.service %{buildroot}/%{_unitdir}/ntpd.service +install -pm 0644 -D etc/ntp-wait.service %{buildroot}/%{_unitdir}/ntp-wait.service ln -s service %{buildroot}%{_sbindir}/rcntpd ln -s service %{buildroot}%{_sbindir}/rcntp-wait -install -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/ntp -install -m 0644 -D %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ntp -install -m 0644 -D %{SOURCE8} %{buildroot}%{_sysconfdir}/ntp.conf +install -pm 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/ntp +install -pm 0644 -D %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ntp +install -pm 0644 -D %{SOURCE8} %{buildroot}%{_sysconfdir}/ntp.conf %fdupes -s %{buildroot} %check -./waf check --verbose %{?_smp_mflags} +python3 ./waf check --verbose %{?_smp_mflags} %pre getent group ntp >/dev/null || groupadd -r ntp @@ -168,8 +159,8 @@ %postun utils %service_del_postun ntp-wait.service -%files -n python2-ntp -%{python_sitearch}/ntp +%files -n python3-ntp +%{python3_sitearch}/ntp %files utils %{_bindir}/ntploggps