Hello community,

here is the log from the commit of package procps for openSUSE:Factory checked 
in at 2013-05-28 07:41:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/procps (Old)
 and      /work/SRC/openSUSE:Factory/.procps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "procps"

Changes:
--------
--- /work/SRC/openSUSE:Factory/procps/procps.changes    2013-05-27 
09:57:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.procps.new/procps.changes       2013-05-28 
07:41:31.000000000 +0200
@@ -1,0 +2,5 @@
+Mon May 27 11:07:58 UTC 2013 - [email protected]
+
+- move sysctl defaults to aaa_base (bnc#820443)
+
+-------------------------------------------------------------------

Old:
----
  sysctl.conf
  sysctl.conf.s390

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ procps.spec ++++++
--- /var/tmp/diff_new_pack.RUhLji/_old  2013-05-28 07:41:32.000000000 +0200
+++ /var/tmp/diff_new_pack.RUhLji/_new  2013-05-28 07:41:32.000000000 +0200
@@ -41,8 +41,6 @@
 Source1:        procps-pmap-legacy.tar.bz2
 Source2:        boot.sysctl
 Source3:        systat.xinetd
-Source4:        sysctl.conf
-Source5:        sysctl.conf.s390
 Patch0:         procps-v3.3.4-watch.patch
 Patch1:         procps-v3.3.3-ia64.diff
 Patch2:         procps-v3.3.4-stealtime.patch
@@ -160,8 +158,6 @@
 %install
 make DESTDIR=%{buildroot} install
 install -d %{buildroot}/etc/xinetd.d
-install -d %{buildroot}/lib/sysctl.d
-install -d %{buildroot}/etc/sysctl.d
 install -d %{buildroot}/bin
 install -d %{buildroot}/sbin
 %if 0%{?suse_version} < 1230
@@ -169,10 +165,6 @@
 install -m 755 %{S:2} %{buildroot}/etc/init.d
 %endif
 install -m 644 %{S:3} %{buildroot}/etc/xinetd.d/systat
-install -m 644 %{S:4} %{buildroot}/lib/sysctl.d/sysctl.conf
-case "$RPM_ARCH" in
-s390*)  install -m 644 %{S:4} %{buildroot}/lib/sysctl.d/sysctl-s390.conf ;;
-esac
 
 # clean unwanted files (e.g. coreutils)
 rm -f %{buildroot}/usr/bin/kill
@@ -203,28 +195,6 @@
 %{fillup_and_insserv -ny boot.sysctl boot.sysctl}
 %endif
 #
-test -e /etc/sysctl.conf || cat <<EOF >/etc/sysctl.conf
-####
-#
-# /etc/sysctl.conf is meant for local sysctl settings
-#
-# sysctl reads settings from the following locations:
-#   /boot/sysctl.conf-<kernelversion>
-#   /lib/sysctl.d/*.conf
-#   /usr/lib/sysctl.conf.d/*.conf
-#   /usr/local/lib/sysctl.d/*.conf
-#   /etc/sysctl.d/*.conf
-#   /run/sysctl.d/*.conf
-#   /etc/sysctl.conf
-#
-# To disable or override a distribution provided file just place a
-# file with the same name in /etc/sysctl.d/
-#
-# See sysctl.conf(5) and sysctl(8) for more information
-#
-####
-EOF
-
 %postun
 %insserv_cleanup
 
@@ -241,7 +211,6 @@
 %if 0%{?suse_version} < 1230
 %config /etc/init.d/boot.sysctl
 %endif
-%config(noreplace) %ghost %attr(0644,root,root) /etc/sysctl.conf
 %config(noreplace) /etc/xinetd.d/systat
 %if %{with bin2usr}
 %verify(link) /bin/ps
@@ -273,9 +242,6 @@
 %{_bindir}/vmstat
 %{_bindir}/w
 %{_bindir}/watch
-%dir /etc/sysctl.d
-%dir /lib/sysctl.d
-/lib/sysctl.d/*.conf
 %_mandir/man1/free.1.gz
 %_mandir/man1/pgrep.1.gz
 %_mandir/man1/pkill.1.gz

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to