Hello community, here is the log from the commit of package aaa_base for openSUSE:12.1 checked in at 2011-11-10 16:00:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/aaa_base (Old) and /work/SRC/openSUSE:12.1/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base", Maintainer is "ro@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1/aaa_base/aaa_base.changes 2011-11-05 11:43:14.000000000 +0100 +++ /work/SRC/openSUSE:12.1/.aaa_base.new/aaa_base.changes 2011-11-10 16:00:25.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 10 14:37:16 UTC 2011 - fcrozat@suse.com + +- Ensure /sbin/service is not clearing SYSTEMD_NO_WRAP + +------------------------------------------------------------------- +Mon Nov 7 18:26:41 CET 2011 - dmueller@suse.de + +- add color aliases for grep variants + +------------------------------------------------------------------- New: ---- _link systemd_no_wrap_service.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.rq2qGx/_old 2011-11-10 16:00:25.000000000 +0100 +++ /var/tmp/diff_new_pack.rq2qGx/_new 2011-11-10 16:00:25.000000000 +0100 @@ -35,6 +35,7 @@ # run make package in checkout out git repo to recreate Source: aaa_base.tar.bz2 Source99: aaa_base-rpmlintrc +Patch0: systemd_no_wrap_service.patch %description This package installs several important configuration files. Central @@ -54,6 +55,7 @@ %prep %setup -n aaa_base +%patch0 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} ++++++ _link ++++++ <link project="Base:System" package="aaa_base" baserev="68280165c10e6d0998a4746051c8d806"> <patches> <branch/> </patches> </link> ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/profile.d/alias.bash new/aaa_base/files/etc/profile.d/alias.bash --- old/aaa_base/files/etc/profile.d/alias.bash 2011-11-02 15:39:14.000000000 +0100 +++ new/aaa_base/files/etc/profile.d/alias.bash 2011-11-07 18:26:20.000000000 +0100 @@ -24,6 +24,9 @@ alias -- -='popd' fi alias rd=rmdir +alias egrep='egrep --color=auto' +alias fgrep='fgrep --color=auto' +alias grep='grep --color=auto' alias md='mkdir -p' if test "$is" = "bash" -a ! -x /bin/which -a ! -x /usr/bin/which ; then # ++++++ systemd_no_wrap_service.patch ++++++ diff --git a/files/sbin/service b/files/sbin/service index 5984b28..56ad239 100755 --- a/files/sbin/service +++ b/files/sbin/service @@ -21,12 +21,13 @@ RCDIR="/etc/init.d" # PATH=/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin test -n "$TERM" || TERM=raw +test -n "$SYSTEMD_NO_WRAP" && export SYSTEMD_NO_WRAP LANG=POSIX export PATH TERM LANG exec_rc () { - env -i LANG=$LANG PATH=$PATH TERM=$TERM ${1+"$@"} + env -i LANG=$LANG PATH=$PATH TERM=$TERM SYSTEMD_NO_WRAP=$SYSTEMD_NO_WRAP ${1+"$@"} } usage () -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org