Author: locilka Date: Wed Oct 22 15:27:43 2008 New Revision: 52429 URL: http://svn.opensuse.org/viewcvs/yast?rev=52429&view=rev Log: - PatchCD control file moved to yast2-wagon. Added: trunk/wagon/src/config/cd_update.desktop (contents, props changed) - copied, changed from r52316, trunk/online-update/src/cd_update.desktop Removed: trunk/online-update/src/cd_update.desktop Modified: trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/Makefile.am trunk/online-update/yast2-online-update.spec.in trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/config/Makefile.am trunk/wagon/src/modules/Wagon.ycp trunk/wagon/yast2-wagon.spec.in Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-online-update.changes?rev=52429&r1=52428&r2=52429&view=diff ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Oct 22 15:27:43 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 22 15:26:51 CEST 2008 - locilka@suse.cz + +- PatchCD control file moved to yast2-wagon. + +------------------------------------------------------------------- Tue Oct 21 16:35:54 CEST 2008 - jsuchome@suse.cz - show support status in package selection (bnc#435479) Modified: trunk/online-update/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/Makefile.am?rev=52429&r1=52428&r2=52429&view=diff ============================================================================== --- trunk/online-update/src/Makefile.am (original) +++ trunk/online-update/src/Makefile.am Wed Oct 22 15:27:43 2008 @@ -17,8 +17,7 @@ OnlineUpdateCallbacks.ycp desktop_DATA = \ - online_update.desktop \ - cd_update.desktop + online_update.desktop EXTRA_DIST = $(client_DATA) $(module_DATA) $(desktop_DATA) Modified: trunk/online-update/yast2-online-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/yast2-online-update.spec.in?rev=52429&r1=52428&r2=52429&view=diff ============================================================================== --- trunk/online-update/yast2-online-update.spec.in (original) +++ trunk/online-update/yast2-online-update.spec.in Wed Oct 22 15:27:43 2008 @@ -16,6 +16,8 @@ Obsoletes: yast2-trans-online-update y2t_online_update BuildArchitectures: noarch +Conflicts: yast2-wagon >= 2.17.3 + Summary: YaST2 online update %description @@ -26,8 +28,6 @@ @BUILD@ @INSTALL@ -mkdir -p "$RPM_BUILD_ROOT"@vardir@ -cp $RPM_BUILD_ROOT/usr/share/applications/YaST2/cd_update.desktop $RPM_BUILD_ROOT/var/lib/YaST2/cd_update.desktop @CLEAN@ @@ -50,18 +50,6 @@ %description frontend - -%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 - if [ -f /var/lib/YaST2/cd_update.desktop ] ; then - cp /var/lib/YaST2/cd_update.desktop /usr/share/applications/YaST2/ - fi -fi - %files frontend %defattr(-,root,root) @desktopdir@/online_update.desktop -@vardir@/cd_update.desktop -%ghost @desktopdir@/cd_update.desktop Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.changes?rev=52429&r1=52428&r2=52429&view=diff ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Oct 22 15:27:43 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 17 14:18:43 CEST 2008 - locilka@suse.cz + +- PatchCD control file moved here from yast2-online-update. + +------------------------------------------------------------------- Fri Oct 17 13:16:51 CEST 2008 - locilka@suse.cz - Added wagon_update_proposal client and DUP proposal functions Modified: trunk/wagon/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/Makefile.am?rev=52429&r1=52428&r2=52429&view=diff ============================================================================== --- trunk/wagon/src/config/Makefile.am (original) +++ trunk/wagon/src/config/Makefile.am Wed Oct 22 15:27:43 2008 @@ -6,6 +6,6 @@ control_DATA = $(wildcard *.xml) -desktop_DATA = +desktop_DATA = $(wildcard *.desktop) EXTRA_DIST = $(desktop_DATA) $(control_DATA) Copied: trunk/wagon/src/config/cd_update.desktop (from r52316, trunk/online-update/src/cd_update.desktop) URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/cd_update.desktop?p2=trunk/wagon/src/config/cd_update.desktop&p1=trunk/online-update/src/cd_update.desktop&r1=52316&r2=52429&rev=52429&view=diff ============================================================================== --- trunk/online-update/src/cd_update.desktop (original) +++ trunk/wagon/src/config/cd_update.desktop Wed Oct 22 15:27:43 2008 @@ -6,10 +6,10 @@ X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 -X-SuSE-YaST-Call=online_update +X-SuSE-YaST-Call=wagon X-SuSE-YaST-Group=Software -X-SuSE-YaST-Argument=.cd_default +X-SuSE-YaST-Argument=PatchCD X-SuSE-YaST-RootOnly=true X-SuSE-YaST-AutoInst= X-SuSE-YaST-Geometry= @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-cd_update -Exec=/sbin/yast2 online_update cd_update +Exec=/sbin/yast2 wagon PatchCD Name=Patch CD Update GenericName=Install patches from CD to correct and improve your existing installation Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=52429&r1=52428&r2=52429&view=diff ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Wed Oct 22 15:27:43 2008 @@ -118,6 +118,11 @@ */ global void Init (map commands) { if (haskey (commands, "command")) { + if (commands["command"]:"" == "cd_update") { + // Backward compatibility + commands["command"] = "PatchCD"; + } + y2milestone ("Starting workflow defined: %1", commands["command"]:""); SetUpdateWorkflow (commands["command"]:""); } else { Modified: trunk/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=52429&r1=52428&r2=52429&view=diff ============================================================================== --- trunk/wagon/yast2-wagon.spec.in (original) +++ trunk/wagon/yast2-wagon.spec.in Wed Oct 22 15:27:43 2008 @@ -6,6 +6,8 @@ Requires: yast2-online-update BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update +Provides: yast2-online-update:/usr/share/applications/YaST2/cd_update.desktop + BuildArchitectures: noarch Summary: YaST2 - Migration Tool for Service Packs @@ -28,5 +30,6 @@ @moduledir@/*.ycp @moduledir@/*.ybc %dir /usr/share/YaST2/control +@desktopdir@/*.desktop /usr/share/YaST2/control/online_migration.xml %doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org