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/dirinstall.patch

See also:

  https://github.com/yast/ycp-killer
  • Loading branch information
yast-bot committed Jul 30, 2013
1 parent 0f969b5 commit 3cee4f6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
3 changes: 1 addition & 2 deletions control/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ controldir = $(yast2dir)/control
control_DATA = \
dirinstall.xml

desktop_DATA = $(wildcard *.desktop)
EXTRA_DIST = $(desktop_DATA) $(control_DATA)
EXTRA_DIST = $(control_DATA)

# validate the control file in 'make check' run
check-local:
Expand Down
1 change: 0 additions & 1 deletion doc/autodocs/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs

AUTODOCS_YCP = $(wildcard $(srcdir)/../../src/*/*.ycp)
AUTODOCS_PM = $(wildcard $(srcdir)/../../src/*/*.pm)
include $(top_srcdir)/autodocs-ycp.ami
2 changes: 1 addition & 1 deletion testsuite/Makefile.am
Original file line number Diff line number Diff line change
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
4 changes: 3 additions & 1 deletion yast2-dirinstall.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Provides: /usr/share/YaST2/clients/dirinstall.ycp

BuildArchitectures: noarch

Requires: yast2-ruby-bindings >= 1.0.0

Summary: YaST2 - Installation into Directory

%description
Expand All @@ -41,7 +43,7 @@ directory.
%defattr(-,root,root)
%dir @yncludedir@/dirinstall
@yncludedir@/dirinstall/*
@clientdir@/*.ycp
@clientdir@/*.rb
@moduledir@/*
@desktopdir@/*.desktop
%dir /usr/share/YaST2/control
Expand Down

0 comments on commit 3cee4f6

Please sign in to comment.