Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2013-08-12 11:04:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-devtools (Old) and /work/SRC/openSUSE:Factory/.yast2-devtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-devtools" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-devtools/yast2-devtools.changes 2013-08-04 23:52:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes 2013-08-12 11:04:30.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 7 07:38:46 UTC 2013 - lsle...@suse.cz + +- added ycp2yml client for converting static YCP data files into + YAML format +- 3.0.2 + +------------------------------------------------------------------- Old: ---- yast2-devtools-3.0.1.tar.bz2 New: ---- yast2-devtools-3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.uqosNV/_old 2013-08-12 11:04:31.000000000 +0200 +++ /var/tmp/diff_new_pack.uqosNV/_new 2013-08-12 11:04:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.0.1 +Version: 3.0.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -126,6 +126,8 @@ %{_prefix}/lib/YaST2/bin %dir %{_prefix}/share/YaST2 /usr/share/YaST2/data +%dir /usr/share/YaST2/clients +/usr/share/YaST2/clients/*.rb %{_prefix}/share/aclocal/*.m4 %{_prefix}/share/pkgconfig/yast2-devtools.pc %doc %{_prefix}/share/doc/packages/yast2-devtools ++++++ yast2-devtools-3.0.1.tar.bz2 -> yast2-devtools-3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.0.1/VERSION new/yast2-devtools-3.0.2/VERSION --- old/yast2-devtools-3.0.1/VERSION 2013-08-02 16:46:46.000000000 +0200 +++ new/yast2-devtools-3.0.2/VERSION 2013-08-07 16:31:33.000000000 +0200 @@ -1 +1 @@ -3.0.1 +3.0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.0.1/configure new/yast2-devtools-3.0.2/configure --- old/yast2-devtools-3.0.1/configure 2013-08-02 16:47:06.000000000 +0200 +++ new/yast2-devtools-3.0.2/configure 2013-08-07 17:55:33.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-devtools 3.0.1. +# Generated by GNU Autoconf 2.69 for yast2-devtools 3.0.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='yast2-devtools' PACKAGE_TARNAME='yast2-devtools' -PACKAGE_VERSION='3.0.1' -PACKAGE_STRING='yast2-devtools 3.0.1' +PACKAGE_VERSION='3.0.2' +PACKAGE_STRING='yast2-devtools 3.0.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1383,7 +1383,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-devtools 3.0.1 to adapt to many kinds of systems. +\`configure' configures yast2-devtools 3.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1454,7 +1454,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-devtools 3.0.1:";; + short | recursive ) echo "Configuration of yast2-devtools 3.0.2:";; esac cat <<\_ACEOF @@ -1571,7 +1571,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-devtools configure 3.0.1 +yast2-devtools configure 3.0.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1970,7 +1970,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-devtools $as_me 3.0.1, which was +It was created by yast2-devtools $as_me 3.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2909,7 +2909,7 @@ # Define the identity of the package. PACKAGE='yast2-devtools' - VERSION='3.0.1' + VERSION='3.0.2' cat >>confdefs.h <<_ACEOF @@ -3032,7 +3032,7 @@ -VERSION="3.0.1" +VERSION="3.0.2" RPMNAME="yast2-devtools" MAINTAINER="Martin Vidner <mvid...@suse.cz>" @@ -16315,7 +16315,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-devtools $as_me 3.0.1, which was +This file was extended by yast2-devtools $as_me 3.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16372,7 +16372,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-devtools config.status 3.0.1 +yast2-devtools config.status 3.0.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.0.1/configure.ac new/yast2-devtools-3.0.2/configure.ac --- old/yast2-devtools-3.0.1/configure.ac 2013-08-02 16:46:53.000000000 +0200 +++ new/yast2-devtools-3.0.2/configure.ac 2013-08-07 17:55:18.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2-devtools dnl -dnl -- This file is generated by y2autoconf 3.0.1 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.2 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-devtools, 3.0.1, http://bugs.opensuse.org/, yast2-devtools) +AC_INIT(yast2-devtools, 3.0.2, http://bugs.opensuse.org/, yast2-devtools) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="3.0.1" +VERSION="3.0.2" RPMNAME="yast2-devtools" MAINTAINER="Martin Vidner <mvid...@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.0.1/devtools/bin/version new/yast2-devtools-3.0.2/devtools/bin/version --- old/yast2-devtools-3.0.1/devtools/bin/version 2013-08-02 16:47:18.000000000 +0200 +++ new/yast2-devtools-3.0.2/devtools/bin/version 2013-08-07 17:55:45.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/bash -echo 3.0.1 +echo 3.0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.0.1/yast2/Makefile.am new/yast2-devtools-3.0.2/yast2/Makefile.am --- old/yast2-devtools-3.0.1/yast2/Makefile.am 2013-01-21 16:11:19.000000000 +0100 +++ new/yast2-devtools-3.0.2/yast2/Makefile.am 2013-08-07 16:31:33.000000000 +0200 @@ -19,4 +19,6 @@ vimftdir = $(prefix)/share/vim/site/ftdetect vimft_DATA = ycp_filetype.vim -EXTRA_DIST = $(pkgdata_SCRIPTS) $(emacs_DATA) $(vimsyntax_DATA) $(vimft_DATA) +client_DATA = ycp2yml.rb + +EXTRA_DIST = $(pkgdata_SCRIPTS) $(emacs_DATA) $(vimsyntax_DATA) $(vimft_DATA) $(client_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.0.1/yast2/Makefile.in new/yast2-devtools-3.0.2/yast2/Makefile.in --- old/yast2-devtools-3.0.1/yast2/Makefile.in 2013-08-02 16:47:09.000000000 +0200 +++ new/yast2-devtools-3.0.2/yast2/Makefile.in 2013-08-07 17:55:36.000000000 +0200 @@ -94,8 +94,9 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(emacsdir)" \ - "$(DESTDIR)$(vimftdir)" "$(DESTDIR)$(vimsyntaxdir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(clientdir)" \ + "$(DESTDIR)$(emacsdir)" "$(DESTDIR)$(vimftdir)" \ + "$(DESTDIR)$(vimsyntaxdir)" SCRIPTS = $(pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) @@ -117,7 +118,7 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -DATA = $(emacs_DATA) $(vimft_DATA) $(vimsyntax_DATA) +DATA = $(client_DATA) $(emacs_DATA) $(vimft_DATA) $(vimsyntax_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -329,7 +330,8 @@ vimsyntax_DATA = ycp.vim vimftdir = $(prefix)/share/vim/site/ftdetect vimft_DATA = ycp_filetype.vim -EXTRA_DIST = $(pkgdata_SCRIPTS) $(emacs_DATA) $(vimsyntax_DATA) $(vimft_DATA) +client_DATA = ycp2yml.rb +EXTRA_DIST = $(pkgdata_SCRIPTS) $(emacs_DATA) $(vimsyntax_DATA) $(vimft_DATA) $(client_DATA) all: all-recursive .SUFFIXES: @@ -404,6 +406,27 @@ clean-libtool: -rm -rf .libs _libs +install-clientDATA: $(client_DATA) + @$(NORMAL_INSTALL) + @list='$(client_DATA)'; test -n "$(clientdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(clientdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(clientdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(clientdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(clientdir)" || exit $$?; \ + done + +uninstall-clientDATA: + @$(NORMAL_UNINSTALL) + @list='$(client_DATA)'; test -n "$(clientdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(clientdir)'; $(am__uninstall_files_from_dir) install-emacsDATA: $(emacs_DATA) @$(NORMAL_INSTALL) @list='$(emacs_DATA)'; test -n "$(emacsdir)" || list=; \ @@ -681,7 +704,7 @@ all-am: Makefile $(SCRIPTS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(emacsdir)" "$(DESTDIR)$(vimftdir)" "$(DESTDIR)$(vimsyntaxdir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(emacsdir)" "$(DESTDIR)$(vimftdir)" "$(DESTDIR)$(vimsyntaxdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -734,8 +757,9 @@ info-am: -install-data-am: install-data-local install-emacsDATA \ - install-pkgdataSCRIPTS install-vimftDATA install-vimsyntaxDATA +install-data-am: install-clientDATA install-data-local \ + install-emacsDATA install-pkgdataSCRIPTS install-vimftDATA \ + install-vimsyntaxDATA install-dvi: install-dvi-recursive @@ -779,8 +803,9 @@ ps-am: -uninstall-am: uninstall-emacsDATA uninstall-pkgdataSCRIPTS \ - uninstall-vimftDATA uninstall-vimsyntaxDATA +uninstall-am: uninstall-clientDATA uninstall-emacsDATA \ + uninstall-pkgdataSCRIPTS uninstall-vimftDATA \ + uninstall-vimsyntaxDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ cscopelist-recursive ctags-recursive install-am install-strip \ @@ -791,16 +816,17 @@ cscopelist cscopelist-recursive ctags ctags-recursive \ distclean distclean-generic distclean-libtool distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-data-local \ - install-dvi install-dvi-am install-emacsDATA install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-pkgdataSCRIPTS install-ps install-ps-am install-strip \ - install-vimftDATA install-vimsyntaxDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-emacsDATA \ + install-am install-clientDATA install-data install-data-am \ + install-data-local install-dvi install-dvi-am \ + install-emacsDATA install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pkgdataSCRIPTS install-ps \ + install-ps-am install-strip install-vimftDATA \ + install-vimsyntaxDATA installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-clientDATA uninstall-emacsDATA \ uninstall-pkgdataSCRIPTS uninstall-vimftDATA \ uninstall-vimsyntaxDATA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.0.1/yast2/ycp2yml.rb new/yast2-devtools-3.0.2/yast2/ycp2yml.rb --- old/yast2-devtools-3.0.1/yast2/ycp2yml.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.0.2/yast2/ycp2yml.rb 2013-08-07 17:55:11.000000000 +0200 @@ -0,0 +1,43 @@ +# encoding: utf-8 +# +# Converts static YCP data file from YCP format to YAML format +# +# Example usage: +# /sbin/yast2 ycp2yml /usr/share/YaST2/data/consolefonts.ycp consolefonts.yml +# +# NOTE: The input YCP file is evaluated and the result is saved into YML file, +# it does not convert the actions inside the YCP file, only the evaluated result. +# +# This means that e.g. translations will not work as expected, the comments +# will be lost, etc... +# +# Do not use it for other YCP files which contain code (modules, clients), +# that will not work!! +# + + +require 'yaml' + +module Yast + class Ycp2YmlClient < Client + def main + # parse_options + from = WFM.Args(0) + to = WFM.Args(1) + + if (from && !from.empty? && to && !to.empty?) + puts "Converting #{from} to #{to}..." + + # run the conversion + convert(from, to) + end + end + + def convert(from, to) + data = Builtins.eval(SCR.Read(path(".target.ycp"), from)) + File.open(to, 'w') {|f| f.write(data.to_yaml) } + end + end +end + +Yast::Ycp2YmlClient.new.main -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org