Author: locilka
Date: Fri Feb 18 15:56:22 2011
New Revision: 63447
URL: http://svn.opensuse.org/viewcvs/yast?rev=63447&view=rev
Log:
- yast2-wagon control files have been moved to separate packages
yast2-wagon-control-SLE and yast2-wagon-control-openSUSE.
- 2.20.3
Added:
trunk/wagon/src/config/online_migration-SLE.xml
- copied unchanged from r63132, trunk/wagon/src/config/online_migration.xml
trunk/wagon/src/config/online_migration-openSUSE.xml
Removed:
trunk/wagon/src/config/online_migration.xml
Modified:
trunk/wagon/VERSION
trunk/wagon/package/yast2-wagon.changes
trunk/wagon/yast2-wagon.spec.in
Modified: trunk/wagon/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=63447&r1=63446&r2=63447&view=diff
==============================================================================
--- trunk/wagon/VERSION (original)
+++ trunk/wagon/VERSION Fri Feb 18 15:56:22 2011
@@ -1 +1 @@
-2.20.2
+2.20.3
Modified: trunk/wagon/package/yast2-wagon.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.changes?rev=63447&r1=63446&r2=63447&view=diff
==============================================================================
--- trunk/wagon/package/yast2-wagon.changes (original)
+++ trunk/wagon/package/yast2-wagon.changes Fri Feb 18 15:56:22 2011
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Feb 18 14:22:27 CET 2011 - locilka@suse.cz
+
+- yast2-wagon control files have been moved to separate packages
+ yast2-wagon-control-SLE and yast2-wagon-control-openSUSE.
+- 2.20.3
+
+-------------------------------------------------------------------
Wed Jan 5 10:58:15 CET 2011 - locilka@suse.cz
- Added more explicit RPM requirements (BNC #613820, Comment #22)
Added: trunk/wagon/src/config/online_migration-openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/online_migration-openSUSE.xml?rev=63447&view=auto
==============================================================================
--- trunk/wagon/src/config/online_migration-openSUSE.xml (added)
+++ trunk/wagon/src/config/online_migration-openSUSE.xml Fri Feb 18 15:56:22 2011
@@ -0,0 +1,265 @@
+<?xml version="1.0"?>
+<!--
+ Use /usr/share/YaST2/control/control.rng for control file validation,
+ e.g., xmllint -noout -relaxng /usr/share/YaST2/control/control.rng ${XML_FILE}
+-->
+http://www.suse.com/1.0/yast2ns"
+ xmlns:config="http://www.suse.com/1.0/configns">
+
+<!-- This workflow is part of the yast2-wagon package -->
+
+<!--
+Work around for the text domain
+textdomain="online-migration"
+-->
+ <textdomain>online-migration</textdomain>
+
+ <globals>
+ <!-- Change to 'true' to debug the workflow steps -->
+ false
+
+ manual
+
+ <subworkflows config:type="list">
+ <!--
+ Simple workflow: Used when WAGON is called from applet
+ -->
+ <subworkflow>
+ <name>running_by_applet</name>
+ <modules config:type="list">
+ <module>welcome</module>
+ <module>update_online_mechanism</module>
+ <module>install_migration_products</module>
+ <module>wagon_modify_repositories</module>
+ <module>prepare_progress</module>
+ <module>point_of_no_return</module>
+ <module>wagon_kickoff</module>
+ <module>wagon_rpmcopy</module>
+ <module>suseconfig_after_update</module>
+ <module>finished</module>
+ </modules>
+ <proposals config:type="list">
+ <proposal>wagon_proposal</proposal>
+ </proposals>
+ </subworkflow>
+
+ <subworkflow>
+ <name>manual</name>
+ <modules config:type="list">
+ <module>welcome</module>
+ <module>update_online_mechanism</module>
+ <module>install_migration_products</module>
+ <module>wagon_manual_url_repositories</module>
+ <module>wagon_modify_repositories</module>
+ <module>wagon_check_repositories</module>
+ <module>prepare_progress</module>
+ <module>point_of_no_return</module>
+ <module>wagon_kickoff</module>
+ <module>wagon_rpmcopy</module>
+ <module>suseconfig_after_update</module>
+ <module>finished</module>
+ </modules>
+ <proposals config:type="list">
+ <proposal>wagon_proposal</proposal>
+ </proposals>
+ </subworkflow>
+
+ <!--
+ PatchCD workflow: 'Custom URL' used directly
+ -->
+ <subworkflow>
+ <name>PatchCD</name>
+ <modules config:type="list">
+ <module>welcome</module>
+ <module>wagon_custom_url</module>
+ <module>wagon_selfupdate_from_url</module>
+ <module>prepare_progress</module>
+ <module>point_of_no_return</module>
+ <module>wagon_kickoff</module>
+ <module>wagon_rpmcopy</module>
+ <module>suseconfig_after_update</module>
+ <module>finished</module>
+ </modules>
+ <proposals config:type="list">
+ <proposal>wagon_proposal</proposal>
+ </proposals>
+ </subworkflow>
+ </subworkflows>
+ </globals>
+
+ <software>
+ <!--
+ Packages that affect the package manager.
+ If no patches are selected in the wagon self-update
+ packages are used as a fallback.
+ -->
+
+ <package>yast2-wagon</package>
+ <package>yast2-online-update</package>
+ <package>yast2-pkg-bindings</package>
+ <package>yast2-update</package>
+ <package>libzypp</package>
+
+ </software>
+
+ <proposals config:type="list">
+ <proposal>
+ <label>Distribution Upgrade Settings</label>
+ <mode>update</mode>
+ <stage>normal</stage>
+ <name>wagon_proposal</name>
+ wagon_proposal
+ no
+
+
+ add-on
+ wagon_update
+ packages
+ backup
+
+ </proposal>
+ </proposals>
+
+ <workflows config:type="list">
+
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ yes
+ yes
+ </defaults>
+
+ <label>Online Migration</label>
+ <!-- Mode: update, Stage: normal -->
+ <mode>update</mode>
+ <stage>normal</stage>
+
+ <modules config:type="list">
+ <module>
+ <heading>yes</heading>
+ <label>Preparation</label>
+ </module>
+
+ <!-- A welcome screen that informs user what is it all about. -->
+ <module>
+ <label>Welcome</label>
+ <name>welcome</name>
+ <execute>welcome_in_wagon</execute>
+ no
+ </module>
+
+ <!-- Update itself -->
+ <module>
+ <label>Renew Update Stack</label>
+ <name>update_online_mechanism</name>
+ <execute>wagon_selfupdate</execute>
+ </module>
+
+ <!-- Add new 'migration-products' -->
+ <module>
+ <label>Migration Configuration</label>
+ <name>install_migration_products</name>
+ <execute>wagon_migration_products</execute>
+ </module>
+
+ <!--
+ Option B:
+ (*) Offered in wagon_update_url if not running via applet
+ -->
+ <module>
+ <label>Migration Configuration</label>
+ <name>wagon_manual_url_repositories</name>
+ <execute>wagon_repositories_handler</execute>
+ </module>
+
+ <!--
+ Used by PatchCD
+ -->
+ <module>
+ <label>Migration Configuration</label>
+ <name>wagon_selfupdate_from_url</name>
+ <execute>wagon_selfupdate</execute>
+ </module>
+
+ <!--
+ Used by PatchCD
+ -->
+ <module>
+ <label>Migration Configuration</label>
+ <name>wagon_custom_url</name>
+ <execute>wagon_custom_url</execute>
+ </module>
+
+ <module>
+ <label>Migration Configuration</label>
+ <name>wagon_modify_repositories</name>
+ <execute>wagon_modify_repositories</execute>
+ </module>
+
+ <module>
+ <label>Migration Configuration</label>
+ <name>wagon_check_repositories</name>
+ <execute>wagon_repositories_handler</execute>
+ </module>
+
+ <module>
+ <heading>yes</heading>
+ <label>Migration</label>
+ </module>
+
+ <!--
+ Use migration URL to Update/Upgrade the running system
+ This will replace the 'migration-product' with 'new-product'
+ -->
+ <module>
+ <label>Update</label>
+ <name>wagon_proposal</name>
+ <execute>inst_proposal</execute>
+ <proposal>wagon_proposal</proposal>
+ </module>
+
+ <!-- Download slideshow, count download sizes, ... -->
+ <module>
+ <label>Update</label>
+ <name>prepare_progress</name>
+ <execute>inst_prepareprogress</execute>
+ </module>
+
+ <!-- From this point, some possibilities are simply 'impossible' ;) -->
+ <module>
+ <label>Update</label>
+ <name>point_of_no_return</name>
+ <execute>wagon_point_of_no_return</execute>
+ </module>
+
+ <module>
+ <label>Update</label>
+ <name>wagon_kickoff</name>
+ <execute>inst_kickoff</execute>
+ </module>
+
+ <!-- Upgrade the packages -->
+ <module>
+ <label>Update</label>
+ <name>wagon_rpmcopy</name>
+ <execute>inst_rpmcopy</execute>
+ </module>
+
+ <module>
+ <label>Update</label>
+ <name>suseconfig_after_update</name>
+ <execute>inst_suseconfig</execute>
+ </module>
+
+ <!-- Congratulate, Inform user to reboot etc. -->
+ <module>
+ <label>Finished</label>
+ <name>finished</name>
+ <execute>wagon_congratulate</execute>
+ </module>
+ </modules>
+ </workflow>
+
+ </workflows>
+
+</productDefines>
Modified: trunk/wagon/yast2-wagon.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=63447&r1=63446&r2=63447&view=diff
==============================================================================
--- trunk/wagon/yast2-wagon.spec.in (original)
+++ trunk/wagon/yast2-wagon.spec.in Fri Feb 18 15:56:22 2011
@@ -15,9 +15,6 @@
# Counting packages directly in packages proposal (BNC #573482)
Requires: yast2-update >= 2.18.7
-# Prevent from crashes (BNC #551613)
-Requires: yast2-registration >= 2.18.0
-
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update
# xmllint
@@ -26,12 +23,15 @@
# control.rng
BuildRequires: yast2-installation >= 2.17.44
-Provides: yast2-online-update-frontend:/usr/share/applications/YaST2/cd_update.desktop
+Provides: yast2-online-update-frontend:%{_datadir}/applications/YaST2/cd_update.desktop
# See BNC #613820, Comment #22
Conflicts: yast2-perl-bindings < 2.19.0
Conflicts: yast2-storage < 2.19.0
+# Requires a control file
+Requires: wagon-control-file
+
BuildArchitectures: noarch
Summary: YaST2 - Migration Tool for Service Packs
@@ -46,8 +46,12 @@
@BUILD@
@INSTALL@
+xmllint --noout --relaxng %{_datadir}/YaST2/control/control.rng %{buildroot}%{_datadir}/YaST2/control/*.xml
+# ghost file
+touch %{buildroot}%{_datadir}/YaST2/control/online_migration.xml
@CLEAN@
+rm -rf %{buildroot}%%{_datadir}/YaST2/control/online_migration.xml
%files
%defattr(-,root,root)
@@ -55,7 +59,72 @@
@clientdir@/*.ycp
@moduledir@/*.ycp
@moduledir@/*.ybc
-%dir /usr/share/YaST2/control
@desktopdir@/*.desktop
-/usr/share/YaST2/control/*.xml
%doc @docdir@
+%exclude %{_datadir}/YaST2/control
+%exclude %{_datadir}/YaST2/control/*.xml
+
+###
+#
+# yast2-wagon-control-openSUSE
+#
+###
+
+%package control-openSUSE
+
+# Generic 'provides'
+Provides: wagon-control-file
+
+Group: System/YaST
+License: GPL v2 or later
+
+Conflicts: otherproviders(wagon-control-file)
+Supplements: packageand(yast2-wagon:branding-openSUSE)
+
+Summary: YaST Wagon control file for openSUSE
+
+%description control-openSUSE
+YaST Wagon control file for openSUSE
+
+%post control-openSUSE
+ln -sf online_migration-SLE.xml %{_datadir}/YaST2/control/online_migration.xml
+
+%files control-openSUSE
+%defattr(-,root,root)
+%dir %{_datadir}/YaST2/control
+%{_datadir}/YaST2/control/online_migration-openSUSE.xml
+%ghost %{_datadir}/YaST2/control/online_migration.xml
+
+###
+#
+# yast2-wagon-control-SLE
+#
+###
+
+%package control-SLE
+
+# Generic 'provides'
+Provides: wagon-control-file
+
+Group: System/YaST
+License: GPL v2 or later
+
+# Prevent from crashes (BNC #551613)
+Requires: yast2-registration >= 2.18.0
+
+Conflicts: otherproviders(wagon-control-file)
+Supplements: packageand(yast2-wagon:branding-SLE)
+
+Summary: YaST Wagon control file for SLE
+
+%description control-SLE
+YaST Wagon control file for SLE
+
+%post control-SLE
+ln -sf online_migration-SLE.xml %{_datadir}/YaST2/control/online_migration.xml
+
+%files control-SLE
+%defattr(-,root,root)
+%dir %{_datadir}/YaST2/control
+%{_datadir}/YaST2/control/online_migration-SLE.xml
+%ghost %{_datadir}/YaST2/control/online_migration.xml
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
