Hello community, here is the log from the commit of package aaa_base checked in at Fri Apr 28 21:06:47 CEST 2006. -------- --- aaa_base/aaa_base.changes 2006-04-27 15:45:43.000000000 +0200 +++ STABLE/aaa_base/aaa_base.changes 2006-04-27 17:13:56.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 27 17:13:12 CEST 2006 - werner@suse.de + +- bash.bashrc: back to the roots, use -a for l and la (bug #153303) + +------------------------------------------------------------------- @@ -6,0 +12,5 @@ +Wed Apr 26 15:54:35 CEST 2006 - dmueller@suse.de + +- fix sles specific settings in fillup templates (#169639) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.GDEDcn/_old 2006-04-28 21:06:39.000000000 +0200 +++ /var/tmp/diff_new_pack.GDEDcn/_new 2006-04-28 21:06:39.000000000 +0200 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv Autoreqprov: on Version: 10.1 -Release: 33 +Release: 37 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -76,33 +76,24 @@ cp -av /etc/skel/.exrc $RPM_BUILD_ROOT/root/ %{_fixowner} $RPM_BUILD_ROOT %{_fixgroup} $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates +for i in $RPM_BUILD_DIR/sysconfig_parts/sysconfig.* $RPM_BUILD_DIR/sysconfig_parts/removed_variables.aaa_base; do + cp $i $RPM_BUILD_ROOT/var/adm/fillup-templates/ +done # -# what are we building for +## do SLES specific settings BEGIN # -test -e /.buildenv && . /.buildenv +%if %sles_version >= 10 + # reset mail level + sed -i -e "s/^MAIL_LEVEL=.*/MAIL_LEVEL=\"warn\"/" \ + $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.suseconfig + # require root password for shutdown + #sed -i -e "s/^DISPLAYMANAGER_SHUTDOWN=.*/DISPLAYMANAGER_SHUTDOWN=\"root\"/" \ + # $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.displaymanager +%endif # -# now assemble the parts for rc.config +## do SLES specific settings END # -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -TARGET=$RPM_BUILD_ROOT/var/adm/fillup-templates/removed_variables.aaa_base -TARGET2=$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.sysctl -TARGET3=$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.suseconfig -cp $RPM_BUILD_DIR/sysconfig_parts/removed_variables.aaa_base $TARGET - for i in $RPM_BUILD_DIR/sysconfig_parts/sysconfig.* ; do - cp $i $RPM_BUILD_ROOT/var/adm/fillup-templates/ - done -%ifarch sparc sparc64 - cat $TARGET2.stopa >> $TARGET2 -%endif - rm -f $TARGET2.stopa -case $BUILD_DISTRIBUTION_NAME in - *SLES*) - sed -e "s/^BOOT_SPLASH=.*/BOOT_SPLASH=\"no\"/" $TARGET2 > $TARGET2.new - mv $TARGET2.new $TARGET2 - sed -e "s/^MAIL_LEVEL=.*/MAIL_LEVEL=\"warn\"/" $TARGET3 > $TARGET3.new - mv $TARGET3.new $TARGET3 - ;; -esac # ## do arch specific patches BEGIN # @@ -156,8 +147,12 @@ %defattr(-,root,root) %changelog -n aaa_base +* Thu Apr 27 2006 - werner@suse.de +- bash.bashrc: back to the roots, use -a for l and la (bug #153303) * Thu Apr 27 2006 - cthiel@suse.de - obsolete tpctl on x86_64 +* Wed Apr 26 2006 - dmueller@suse.de +- fix sles specific settings in fillup templates (#169639) * Tue Apr 25 2006 - ro@suse.de - comment out "-9" default for GZIP in profile/csh.cshrc (#168800) * Tue Apr 25 2006 - werner@suse.de ++++++ aaa_base.tar.bz2 ++++++ Binary files old/aaa_base/aaa_base.tar.bz2 and new/aaa_base/aaa_base.tar.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/bash.bashrc new/aaa_base/etc/bash.bashrc --- old/aaa_base/etc/bash.bashrc 2006-04-25 14:23:43.000000000 +0200 +++ new/aaa_base/etc/bash.bashrc 2006-04-27 17:11:20.000000000 +0200 @@ -191,8 +191,8 @@ fi alias dir='ls -l' alias ll='ls -l' - alias la='ls -lA' - alias l='ls -AlF' + alias la='ls -la' + alias l='ls -alF' alias ls-l='ls -l' # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/csh.cshrc new/aaa_base/etc/csh.cshrc --- old/aaa_base/etc/csh.cshrc 2006-03-23 16:11:28.000000000 +0100 +++ new/aaa_base/etc/csh.cshrc 2006-04-27 17:15:56.000000000 +0200 @@ -94,7 +94,7 @@ setenv LS_OPTIONS "-N $LS_OPTIONS -T 0" endif alias ls 'ls $LS_OPTIONS' -alias la 'ls -AF --color=none' +alias la 'ls -aF --color=none' alias ll 'ls -l --color=none' alias l 'll' alias dir 'ls --format=vertical' ++++++ sysconfig_parts.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig_parts/sysconfig.sysctl.stopa new/sysconfig_parts/sysconfig.sysctl.stopa --- old/sysconfig_parts/sysconfig.sysctl.stopa 2002-01-16 15:46:00.000000000 +0100 +++ new/sysconfig_parts/sysconfig.sysctl.stopa 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -# -# If you say yes here, you are able to jump back into the Boot PROM -# or to your SPARC. -# -ENABLE_STOP_A=no - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...