Hello community, here is the log from the commit of package yast2-online-update checked in at Tue Feb 20 00:40:41 CET 2007. -------- --- yast2-online-update/yast2-online-update.changes 2007-02-16 11:04:51.000000000 +0100 +++ yast2-online-update/yast2-online-update.changes 2007-02-19 11:13:58.506150000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 19 10:58:57 CET 2007 - jsuchome@suse.cz + +- do not install Patch CD desktop file on s390 (#241507) +- 2.15.5 + +------------------------------------------------------------------- Old: ---- yast2-online-update-2.15.4.tar.bz2 New: ---- yast2-online-update-2.15.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.d21262/_old 2007-02-20 00:39:58.000000000 +0100 +++ /var/tmp/diff_new_pack.d21262/_new 2007-02-20 00:39:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.15.4) +# spec file for package yast2-online-update (Version 2.15.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-online-update -Version: 2.15.4 +Version: 2.15.5 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.15.4.tar.bz2 +Source0: yast2-online-update-2.15.5.tar.bz2 prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager PreReq: grep sed @@ -48,7 +48,7 @@ gs@suse.de %prep -%setup -n yast2-online-update-2.15.4 +%setup -n yast2-online-update-2.15.5 %build %{prefix}/bin/y2tool y2autoconf @@ -67,6 +67,8 @@ d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done +mkdir -p "$RPM_BUILD_ROOT"/var/lib/YaST2 +cp $RPM_BUILD_ROOT/usr/share/applications/YaST2/cd_update.desktop $RPM_BUILD_ROOT/var/lib/YaST2/cd_update.desktop %clean rm -rf "$RPM_BUILD_ROOT" @@ -125,12 +127,24 @@ gs@suse.de +%post frontend +if test "`uname -i`" = "s390" -o "`uname -i`" = "s390x"; then + # remove the.desktop from the older unhacked package during update + rm -f /usr/share/applications/YaST2/cd_update.desktop +else + cp /var/lib/YaST2/cd_update.desktop /usr/share/applications/YaST2/ +fi + %files frontend %defattr(-,root,root) %{prefix}/share/applications/YaST2/online_update.desktop -%{prefix}/share/applications/YaST2/cd_update.desktop +/var/lib/YaST2/cd_update.desktop +%ghost %{prefix}/share/applications/YaST2/cd_update.desktop -%changelog -n yast2-online-update +%changelog +* Mon Feb 19 2007 - jsuchome@suse.cz +- do not install Patch CD desktop file on s390 (#241507) +- 2.15.5 * Fri Feb 16 2007 - jsuchome@suse.cz - changed source prefix for Patch CD (#244983) - reload the target before checking for new patches (#232247) ++++++ yast2-online-update-2.15.4.tar.bz2 -> yast2-online-update-2.15.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.4/VERSION new/yast2-online-update-2.15.5/VERSION --- old/yast2-online-update-2.15.4/VERSION 2007-02-16 08:09:42.000000000 +0100 +++ new/yast2-online-update-2.15.5/VERSION 2007-02-19 10:59:25.000000000 +0100 @@ -1 +1 @@ -2.15.4 +2.15.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org