Hello community, here is the log from the commit of package squid for openSUSE:Factory checked in at 2015-10-19 22:52:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squid (Old) and /work/SRC/openSUSE:Factory/.squid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squid" Changes: -------- --- /work/SRC/openSUSE:Factory/squid/squid.changes 2015-10-12 10:02:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.squid.new/squid.changes 2015-10-20 00:05:47.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Oct 15 14:57:13 UTC 2015 - [email protected] + +- Fix rpmlint errors / warnings + * systemd-service-without-service_add_pre + moved service_add_pre to %pre + * non-etc-or-var-file-marked-as-conffile + moved mib.txt to /usr/share/snmp/mibs/SQUID-MIB.txt + idea taken from Fedora package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.4tlVl2/_old 2015-10-20 00:05:48.000000000 +0200 +++ /var/tmp/diff_new_pack.4tlVl2/_new 2015-10-20 00:05:48.000000000 +0200 @@ -128,7 +128,6 @@ * Basic authentication MSNT helper changes %prep -#setup -q -n %{name}-%{version}%{snap} %setup -q cp %{SOURCE10} . # upstream patches after RELEASE @@ -274,6 +273,11 @@ install -D -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{name} %endif +# Move the MIB definition to the proper place (and name) +mkdir -p $RPM_BUILD_ROOT/usr/share/snmp/mibs +mv $RPM_BUILD_ROOT/usr/share/squid/mib.txt \ + $RPM_BUILD_ROOT/usr/share/snmp/mibs/SQUID-MIB.txt + %pre # we need this group for /usr/sbin/pinger if [[ -z $(%{_bindir}/getent group %{name} 2>/dev/null) ]]; then @@ -298,6 +302,10 @@ %{_sbindir}/usermod -G winbind %{name} 2>/dev/null fi +%if 0%{?has_systemd} +%service_add_pre %{name}.service +%endif + %pretrans # Directory to symlink is not working in RPM so workaround it # Occurs when updating from 3.4 to 3.5 @@ -322,10 +330,6 @@ %{_sbindir}/usermod -g %{name} %{name} fi -%if 0%{?has_systemd} -%service_add_pre %{name}.service -%endif - %post %if 0%{?suse_version} >= 1140 %if 0%{?set_permissions:1} @@ -416,11 +420,13 @@ %config %{_sysconfdir}/permissions.d/%{name} %endif %dir %{_datadir}/%{name} +%dir %{_datadir}/snmp +%dir %{_datadir}/snmp/mibs %{_datadir}/%{name}/errors %{_datadir}/%{name}/icons -%config %{_datadir}/%{name}/mib.txt %{_datadir}/%{name}/mime.conf %{_datadir}/%{name}/mime.conf.default +%{_datadir}/snmp/mibs/SQUID-MIB.txt %{_bindir}/purge %{_bindir}/squidclient %{_sbindir}/basic_db_auth
