Hello community, here is the log from the commit of package squid3 for openSUSE:Factory checked in at Wed Apr 27 10:58:46 CEST 2011.
-------- --- squid3/squid3.changes 2011-04-12 15:12:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/squid3/squid3.changes 2011-04-21 18:08:47.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 21 16:05:07 UTC 2011 - [email protected] + +- mv RPM_BUILD_ROOT to {buildroot} +- fdupes only on {buildroot}{_prefix} + o no symlinks on config files ;) + hence configs won't be overwritten on update + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid3.spec ++++++ --- /var/tmp/diff_new_pack.vuecCN/_old 2011-04-27 10:47:17.000000000 +0200 +++ /var/tmp/diff_new_pack.vuecCN/_new 2011-04-27 10:47:17.000000000 +0200 @@ -22,7 +22,7 @@ Name: squid3 Summary: Squid Version 3 WWW Proxy Server Version: 3.1.12 -Release: 3 +Release: 5 License: GPLv2+ Group: Productivity/Networking/Web/Proxy AutoReqProv: on @@ -198,39 +198,39 @@ %install /usr/sbin/useradd -r -o -g nogroup -u 31 -s /bin/false -c "WWW-proxy squid" \ -d /var/cache/squid squid 2> /dev/null || : -mkdir -p $RPM_BUILD_ROOT/var/{cache,log}/squid -mkdir -p $RPM_BUILD_ROOT/usr/sbin -make install DESTDIR=$RPM_BUILD_ROOT SAMBAPREFIX=/usr -mv $RPM_BUILD_ROOT{/etc/squid/,/usr/share/squid/}mime.conf.default -ln -s /etc/squid/mime.conf $RPM_BUILD_ROOT/usr/share/squid # backward compatible -install -d -m 755 $RPM_BUILD_ROOT/etc/permissions.d -install -m 644 %{SOURCE9} $RPM_BUILD_ROOT/etc/permissions.d/squid -install -d -m 755 $RPM_BUILD_ROOT/etc/logrotate.d -install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc/logrotate.d/squid +mkdir -p %{buildroot}/var/{cache,log}/squid +mkdir -p %{buildroot}/usr/sbin +make install DESTDIR=%{buildroot} SAMBAPREFIX=/usr +mv %{buildroot}{/etc/squid/,/usr/share/squid/}mime.conf.default +ln -s /etc/squid/mime.conf %{buildroot}/usr/share/squid # backward compatible +install -d -m 755 %{buildroot}/etc/permissions.d +install -m 644 %{S:9} %{buildroot}/etc/permissions.d/squid +install -d -m 755 %{buildroot}/etc/logrotate.d +install -m 644 %{S:7} %{buildroot}/etc/logrotate.d/squid install -d %{buildroot}%{_mandir}/man8/ -#chown squid:root -R $RPM_BUILD_ROOT/var/{cache,log}/squid -chmod 750 $RPM_BUILD_ROOT/var/{cache,log}/squid -install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d/squid -ln -sf /etc/init.d/squid $RPM_BUILD_ROOT/usr/sbin/rcsquid -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8/ -install -m 644 doc/squid.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ -install -m 644 helpers/basic_auth/LDAP/squid_ldap_auth.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ -install -m 644 helpers/basic_auth/LDAP/squid_ldap_auth.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ -install -m 644 helpers/basic_auth/PAM/pam_auth.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ -install -m 644 helpers/external_acl/ldap_group/squid_ldap_group.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ -gzip -9 $RPM_BUILD_ROOT/%{_mandir}/man8/*.8 +#chown squid:root -R %{buildroot}/var/{cache,log}/squid +chmod 750 %{buildroot}/var/{cache,log}/squid +install -D %{S:2} %{buildroot}/etc/init.d/squid +ln -sf /etc/init.d/squid %{buildroot}/usr/sbin/rcsquid +mkdir -p %{buildroot}/%{_mandir}/man8/ +install -m 644 doc/squid.8 %{buildroot}/%{_mandir}/man8/ +install -m 644 helpers/basic_auth/LDAP/squid_ldap_auth.8 %{buildroot}/%{_mandir}/man8/ +install -m 644 helpers/basic_auth/LDAP/squid_ldap_auth.8 %{buildroot}/%{_mandir}/man8/ +install -m 644 helpers/basic_auth/PAM/pam_auth.8 %{buildroot}/%{_mandir}/man8/ +install -m 644 helpers/external_acl/ldap_group/squid_ldap_group.8 %{buildroot}/%{_mandir}/man8/ +gzip -9 %{buildroot}/%{_mandir}/man8/*.8 install -d -m 755 doc/scripts install scripts/*.pl doc/scripts cat > doc/scripts/cachemgr.readme <<-EOT cachemgr.cgi will now be found in %{_libdir}/squid EOT -install -d -m 755 $RPM_BUILD_ROOT/%{_libdir}/squid -mv $RPM_BUILD_ROOT/usr/sbin/cachemgr.cgi $RPM_BUILD_ROOT/%{_libdir}/squid +install -d -m 755 %{buildroot}/%{_libdir}/squid +mv %{buildroot}/usr/sbin/cachemgr.cgi %{buildroot}/%{_libdir}/squid install -d -m 755 doc/contrib -install %{SOURCE6} doc/contrib -install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/squid -#chown squid:shadow $RPM_BUILD_ROOT/usr/sbin/pam_auth -chmod g+s $RPM_BUILD_ROOT/usr/sbin/pam_auth +install %{S:6} doc/contrib +install -D -m 644 %{S:5} %{buildroot}/etc/pam.d/squid +#chown squid:shadow %{buildroot}/usr/sbin/pam_auth +chmod g+s %{buildroot}/usr/sbin/pam_auth #rm %{buildroot}/usr/sbin/Run* rm -rf %{buildroot}%{squidconfdir}/errors for i in errors/*; do @@ -239,17 +239,18 @@ install -m 644 $i/* %{buildroot}/usr/share/squid/$i fi done -ln -fs /usr/share/squid/errors/de %{buildroot}%{squidconfdir}/errors -install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.squid +ln -sf /usr/share/squid/errors/de %{buildroot}%{squidconfdir}/errors +install -d -m 755 %{buildroot}/var/adm/fillup-templates +install -m 644 %{S:10} %{buildroot}/var/adm/fillup-templates/sysconfig.squid # remove unpackaged files -rm -f $RPM_BUILD_ROOT/usr/man/man8/*.8 +rm -f %{buildroot}/usr/man/man8/*.8 + # fix file duplicates %if 0%{?suse_version} > 1030 -%fdupes -s $RPM_BUILD_ROOT +%fdupes -s %{buildroot}%{_prefix} %endif %if 0%{?fedora_version} > 8 -fdupes -q -n -r $RPM_BUILD_ROOT +fdupes -q -n -r %{buildroot}%{_prefix} %endif %pre @@ -259,7 +260,7 @@ %{_sbindir}/groupadd -r winbind 2>/dev/null fi if [ -z "`%{_bindir}/getent passwd squid 2>/dev/null`" ]; then -/usr/sbin/useradd -c "WWW-proxy squid" -d /var/cache/squid \ + %{_sbindir}/useradd -c "WWW-proxy squid" -d /var/cache/squid \ -G winbind -g nogroup -o -u 31 -r -s /bin/false \ squid 2>/dev/null fi @@ -292,7 +293,7 @@ %verify_permissions -e /usr/sbin/pam_auth %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files %defattr(-,root,root) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
