Skip to content

Commit

Permalink
YCP Killer: Apply changes needed for Ruby translation
Browse files Browse the repository at this point in the history
This module needed few changes before it was possible to translate its
YCP files into Ruby. This commit performs them.

The commit is a result of running YCP Killer's "patch" command. The
history of the applied patch is available here:

  https://github.com/yast/ycp-killer/commits/master/patches/update.patch

See also:

  https://github.com/yast/ycp-killer
  • Loading branch information
yast-bot committed Jul 30, 2013
1 parent baca273 commit 0daab2c
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
6 changes: 2 additions & 4 deletions control/Makefile.am
@@ -1,14 +1,12 @@
#
# Makefile.am for wagon/src/config
# Makefile.am for control
#

controldir = $(yast2dir)/control

control_DATA = $(wildcard *.xml)

desktop_DATA = $(wildcard *.desktop)

EXTRA_DIST = $(desktop_DATA) $(control_DATA)
EXTRA_DIST = $(control_DATA)

check-local:
xmllint --relaxng $(controldir)/control.rng --noout $(control_DATA)
1 change: 0 additions & 1 deletion doc/autodocs/Makefile.am
Expand Up @@ -2,5 +2,4 @@
# Makefile.am for .../doc/autodocs
#

AUTODOCS_YCP=$(top_srcdir)/src/*/*.ycp
include $(top_srcdir)/autodocs-ycp.ami
2 changes: 1 addition & 1 deletion testsuite/Makefile.am
Expand Up @@ -5,7 +5,7 @@
#

AUTOMAKE_OPTIONS = dejagnu
EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh)
EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.rb)

testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite

Expand Down
30 changes: 17 additions & 13 deletions yast2-update.spec.in
Expand Up @@ -39,6 +39,8 @@ Conflicts: yast2-pkg-bindings < 2.15.11
# Storage::DeviceMatchFstab (#244117)
Conflicts: yast2-storage < 2.15.4

Requires: yast2-ruby-bindings >= 1.0.0

Summary: YaST2 - Update

%package FACTORY
Expand All @@ -50,6 +52,8 @@ Requires: yast2-update yast2
# to remove dependency on yast2-storage
Provides: yast2-update:/usr/share/YaST2/clients/update.ycp

Requires: yast2-ruby-bindings >= 1.0.0

Summary: YaST2 - Update

%description
Expand All @@ -71,19 +75,19 @@ Use this component if you wish to update your system.
@ybindir@/*
@moduledir@/*

@clientdir@/inst_rootpart.ycp
@clientdir@/inst_update.ycp
@clientdir@/inst_backup.ycp
@clientdir@/rootpart_proposal.ycp
@clientdir@/update_proposal.ycp
@clientdir@/packages_proposal.ycp
@clientdir@/backup_proposal.ycp
@clientdir@/inst_update_partition.ycp
@clientdir@/inst_update_partition_auto.ycp
@clientdir@/rootpart_check_keyboard.ycp
@clientdir@/inst_rootpart.rb
@clientdir@/inst_update.rb
@clientdir@/inst_backup.rb
@clientdir@/rootpart_proposal.rb
@clientdir@/update_proposal.rb
@clientdir@/packages_proposal.rb
@clientdir@/backup_proposal.rb
@clientdir@/inst_update_partition.rb
@clientdir@/inst_update_partition_auto.rb
@clientdir@/rootpart_check_keyboard.rb

@yncludedir@/update
@yncludedir@/update/rootpart.ycp
@yncludedir@/update/rootpart.rb

%doc @docdir@

Expand All @@ -92,5 +96,5 @@ Use this component if you wish to update your system.
@desktopdir@/update.desktop
%dir /usr/share/YaST2/control
/usr/share/YaST2/control/update.xml
@clientdir@/update.ycp
@clientdir@/run_update.ycp
@clientdir@/update.rb
@clientdir@/run_update.rb

0 comments on commit 0daab2c

Please sign in to comment.