Hello community,
here is the log from the commit of package aaa_base for openSUSE:Factory
checked in at 2012-02-15 16:14:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aaa_base (Old)
and /work/SRC/openSUSE:Factory/.aaa_base.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base", Maintainer is "r...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2012-01-27
21:29:23.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2012-02-15
16:14:20.000000000 +0100
@@ -1,0 +2,13 @@
+Fri Feb 10 13:25:24 UTC 2012 - lnus...@suse.de
+
+- remove requirement on systemd to avoid cycles.
+ /bin/systemd-tmpfiles is only needed by boot.cleanup when actually
+ booting the system using sysv.
+
+-------------------------------------------------------------------
+Thu Feb 9 17:38:47 UTC 2012 - r...@suse.com
+
+- chkconfig: bypass initscript enable/disable script if service
+ shadowed by systemd
+
+-------------------------------------------------------------------
Old:
----
aaa_base-fix-alljava-bnc722252.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.lTTkKp/_old 2012-02-15 16:14:22.000000000 +0100
+++ /var/tmp/diff_new_pack.lTTkKp/_new 2012-02-15 16:14:22.000000000 +0100
@@ -25,7 +25,7 @@
Provides: bin bootutls etc skeleng skelger
Provides: aaa_skel = %{version}-%{release}
Obsoletes: aaa_skel < %{version}
-Requires: filesystem distribution-release /bin/mktemp /usr/bin/find
/usr/bin/tput /usr/bin/xargs mingetty /bin/login cpio psmisc systemd
+Requires: filesystem distribution-release /bin/mktemp /usr/bin/find
/usr/bin/tput /usr/bin/xargs mingetty /bin/login cpio psmisc
Recommends: cron logrotate netcfg udev net-tools aaa_base-extras
PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date
/usr/bin/cmp /bin/fillup /sbin/insserv
Summary: SUSE Linux Base Package
@@ -34,7 +34,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# run make package in checkout out git repo to recreate
Source: aaa_base.tar.bz2
-Patch1: aaa_base-fix-alljava-bnc722252.diff
Source99: aaa_base-rpmlintrc
%description
@@ -54,7 +53,6 @@
%prep
%setup -n aaa_base
-%patch1 -p1
%build
make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags}
++++++ aaa_base.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aaa_base/files/etc/profile.d/alljava.sh
new/aaa_base/files/etc/profile.d/alljava.sh
--- old/aaa_base/files/etc/profile.d/alljava.sh 2012-01-20 11:18:10.000000000
+0100
+++ new/aaa_base/files/etc/profile.d/alljava.sh 2012-02-09 18:37:58.000000000
+0100
@@ -11,33 +11,34 @@
for JDIR in /usr/lib64/jvm /usr/lib/jvm /usr/java/latest /usr/java; do
- if ! test -d $JPATH; then
+ if ! test -d $JDIR; then
continue
fi
for JPATH in $JDIR $JDIR/java `ls -I 'java' -I 'jre' -d $JDIR/*
2>/dev/null` $JDIR/jre; do
- if ! test -x $JPATH/bin/java ; then
+ if ! test -x $JPATH/bin/java; then
continue
fi
- export JAVA_BINDIR=3D$JPATH/bin
- export JAVA_ROOT=3D$JPATH
- export JAVA_HOME=3D$JPATH
+ export JAVA_BINDIR=$JPATH/bin
+ export JAVA_ROOT=$JPATH
+ export JAVA_HOME=$JPATH
unset JDK_HOME
unset SDK_HOME
case "$JPATH" in
*jre*)
- export JRE_HOME=3D$JPATH
+ export JRE_HOME=$JPATH
;;
*)
- export JRE_HOME=3D$JPATH/jre
+ export JRE_HOME=$JPATH/jre
# it is development kit
if [ -x $JPATH/bin/javac ] ; then
- export JDK_HOME=3D$JPATH
- export SDK_HOME=3D$JPATH
+ export JDK_HOME=$JPATH
+ export SDK_HOME=$JPATH
+ break; # we found a JRE + SDK -- don't look any further
fi
;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aaa_base/files/sbin/chkconfig
new/aaa_base/files/sbin/chkconfig
--- old/aaa_base/files/sbin/chkconfig 2012-01-20 11:18:10.000000000 +0100
+++ new/aaa_base/files/sbin/chkconfig 2012-02-09 18:37:58.000000000 +0100
@@ -8,6 +8,7 @@
my $inetddir = '/etc/inetd.d';
my $xinetddir = '/etc/xinetd.d';
my $systemd_service_path = '/lib/systemd/system';
+my $systemd_etc_service_path = '/etc/systemd/system';
my $systemd_binary_path = '/bin/systemd';
my %to_d = (
@@ -471,7 +472,7 @@
sub is_overriden_by_systemd {
my $service = shift;
my $root = shift;
- return -e "$root/$systemd_service_path/$service.service";
+ return -e "$root/$systemd_service_path/$service.service" or -e
"$root/$systemd_etc_service_path/$service.service";
}
sub forward_to_systemd {
@@ -680,6 +681,14 @@
my $want = shift @services;
$want = normalize($s, $want);
$status = 1, next unless defined $want;
+ if (($root ne "/") or (($root eq "/") and is_systemd_active()) and
is_overriden_by_systemd ($s,$root)) {
+ if ($want ne "") {
+ push @enable, $s;
+ } else {
+ push @remove, $s;
+ }
+ next;
+ }
$current{$s} = getcurrent($s) unless defined $current{$s};
$status = 1, next unless defined $current{$s};
my $current = $current{$s};
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
