Hello community, here is the log from the commit of package cntlm for openSUSE:Factory checked in at 2016-03-07 13:26:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cntlm (Old) and /work/SRC/openSUSE:Factory/.cntlm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cntlm" Changes: -------- --- /work/SRC/openSUSE:Factory/cntlm/cntlm.changes 2015-04-27 13:05:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cntlm.new/cntlm.changes 2016-03-07 13:26:33.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 2 12:11:26 UTC 2016 - [email protected] + +- Revert to state withou conflicts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cntlm.spec ++++++ --- /var/tmp/diff_new_pack.ilD9zI/_old 2016-03-07 13:26:53.000000000 +0100 +++ /var/tmp/diff_new_pack.ilD9zI/_new 2016-03-07 13:26:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cntlm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2007 Scorpio IT, Deidesheim, Germany # # All modifications and additions to the file contributed by third parties @@ -41,7 +41,7 @@ Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq %else -BuildRequires: systemd-rpm-macros +BuildRequires: systemd-devel Requires(pre): %fillup_prereq %{?systemd_requires} %endif @@ -66,14 +66,12 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} %if 0%{?suse_version} < 1230 -install -d %{buildroot}%{_localstatedir}/run/%{name} install -D -m 755 %{SOURCE1} %{buildroot}/%{_initddir}/%{name} ln -s -f ../..%{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} %else -# With systemd, use new standard pid directory /run -install -d %{buildroot}/run/%{name} +install -d %{buildroot}%{_localstatedir}/run/%{name} install -D -m 644 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service -install -D -m 644 %{SOURCE4} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf +install -D -m 644 %{SOURCE4} %{buildroot}/%{_tmpfilesdir}/%{name}.conf ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} %endif install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} @@ -109,6 +107,11 @@ %else %fillup_only %service_add_post %{name}.service +%if 0%{?suse_version} <= 1320 +systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf >/dev/null 2>&1 || : +%else +%tmpfiles_create %{_tmpfilesdir}/%{name}.conf +%endif %endif %postun @@ -126,11 +129,9 @@ %config(noreplace) %{_sysconfdir}/%{name}.conf %if 0%{?suse_version} < 1230 %config(noreplace) %{_initddir}/%{name} -%ghost %dir %attr(755,%{name},root) %{_localstatedir}/run/%{name} %else %{_unitdir}/%{name}.service -%dir %{_libexecdir}/tmpfiles.d -%{_libexecdir}/tmpfiles.d/%{name}.conf +%{_tmpfilesdir}/%{name}.conf %ghost %dir %attr(755,%{name},root) /run/%{name} %endif %{_sbindir}/*
