Hello community,
here is the log from the commit of package yast2-add-on-creator for
openSUSE:Factory checked in at 2013-07-29 09:26:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-add-on-creator (Old)
and /work/SRC/openSUSE:Factory/.yast2-add-on-creator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on-creator"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-add-on-creator/yast2-add-on-creator.changes
2012-12-07 14:53:20.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-add-on-creator.new/yast2-add-on-creator.changes
2013-07-29 09:26:36.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul 24 09:53:56 CEST 2013 - jsuch...@suse.cz
+
+- updated product names and required packages
+- 2.24.0
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-creator-2.23.0.tar.bz2
New:
----
yast2-add-on-creator-2.24.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on-creator.spec ++++++
--- /var/tmp/diff_new_pack.9Qtmsp/_old 2013-07-29 09:26:37.000000000 +0200
+++ /var/tmp/diff_new_pack.9Qtmsp/_new 2013-07-29 09:26:37.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-add-on-creator
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,14 @@
Name: yast2-add-on-creator
-Version: 2.23.0
+Version: 2.24.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-add-on-creator-%{version}.tar.bz2
PreReq: %fillup_prereq
+Requires: rpm-build
Requires: yast2 >= 2.21.22
BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
++++++ yast2-add-on-creator-2.23.0.tar.bz2 ->
yast2-add-on-creator-2.24.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/Makefile.am
new/yast2-add-on-creator-2.24.0/Makefile.am
--- old/yast2-add-on-creator-2.23.0/Makefile.am 2012-12-07 09:11:20.000000000
+0100
+++ new/yast2-add-on-creator-2.24.0/Makefile.am 2013-07-24 12:15:34.000000000
+0200
@@ -158,19 +158,14 @@
TAGVERSION = $(Y2TOOL) tagversion
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep
-v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l`
-gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`";
false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/Makefile.am.common
new/yast2-add-on-creator-2.24.0/Makefile.am.common
--- old/yast2-add-on-creator-2.23.0/Makefile.am.common 2012-12-07
09:11:20.000000000 +0100
+++ new/yast2-add-on-creator-2.24.0/Makefile.am.common 2013-07-24
12:15:34.000000000 +0200
@@ -31,7 +31,7 @@
CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(client_DATA)"; then \
+ @if test "$(filter %.ycp,client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
echo "Checking syntax of $${TO_CHECK}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/Makefile.in
new/yast2-add-on-creator-2.24.0/Makefile.in
--- old/yast2-add-on-creator-2.23.0/Makefile.in 2012-12-07 09:11:25.000000000
+0100
+++ new/yast2-add-on-creator-2.24.0/Makefile.in 2013-07-24 12:15:38.000000000
+0200
@@ -65,7 +65,7 @@
$(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \
config.sub install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -980,19 +980,14 @@
package: check-up-to-date check-tagversion check-textdomain package-local
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep
-v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l`
-gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`";
false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/VERSION
new/yast2-add-on-creator-2.24.0/VERSION
--- old/yast2-add-on-creator-2.23.0/VERSION 2012-12-07 09:09:44.000000000
+0100
+++ new/yast2-add-on-creator-2.24.0/VERSION 2013-07-24 10:06:44.000000000
+0200
@@ -1 +1 @@
-2.23.0
+2.24.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/agents/Makefile.in
new/yast2-add-on-creator-2.24.0/agents/Makefile.in
--- old/yast2-add-on-creator-2.23.0/agents/Makefile.in 2012-12-07
09:11:25.000000000 +0100
+++ new/yast2-add-on-creator-2.24.0/agents/Makefile.in 2013-07-24
12:15:38.000000000 +0200
@@ -57,7 +57,7 @@
subdir = agents
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/autodocs-ycp.ami
new/yast2-add-on-creator-2.24.0/autodocs-ycp.ami
--- old/yast2-add-on-creator-2.23.0/autodocs-ycp.ami 2012-12-07
09:11:20.000000000 +0100
+++ new/yast2-add-on-creator-2.24.0/autodocs-ycp.ami 2013-07-24
12:15:34.000000000 +0200
@@ -8,6 +8,8 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_RB: Files that the ruby autodocs is built from (using yard)
+# Optional - the default is $(srcdir)/../../src/modules/*.rb)
$(srcdir)/../../src/include/*/*.rb
# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
# Optional - the default is no subdir, $(docdir)/autodocs
# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
@@ -15,18 +17,31 @@
htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
-CLEANFILES = $(html_DATA) pod2htm*.tmp
+# use nobase_ prefix to keep the directory structure
+nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
$(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*)
+CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_RB ?= $(wildcard $(srcdir)/../../src/modules/*.rb
$(srcdir)/../../src/include/*/*.rb)
AUTODOCS_STRIP ?= $(srcdir)/../../src
-index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+# yard specific options
+YARD ?= yard
+# use markdown format by default
+YARD_OPTIONS ?= -o . -m markdown
+
+# yard specific clean
+clean-local:
+ rm -rf js css Yast .yardoc
+
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) $(AUTODOCS_RB)
#including *.pm, for the index
- ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
+ if [ -n "$(AUTODOCS_YCP)" ]; then ${YCPDOC} -d. -s$(AUTODOCS_STRIP)
$(AUTODOCS_YCP); fi
for i in $(AUTODOCS_PM); do \
b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__};
b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
+ if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS)
$(AUTODOCS_RB); fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/configure
new/yast2-add-on-creator-2.24.0/configure
--- old/yast2-add-on-creator-2.23.0/configure 2012-12-07 09:11:24.000000000
+0100
+++ new/yast2-add-on-creator-2.24.0/configure 2013-07-24 12:15:37.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-add-on-creator 2.23.0.
+# Generated by GNU Autoconf 2.69 for yast2-add-on-creator 2.24.0.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-add-on-creator'
PACKAGE_TARNAME='yast2-add-on-creator'
-PACKAGE_VERSION='2.23.0'
-PACKAGE_STRING='yast2-add-on-creator 2.23.0'
+PACKAGE_VERSION='2.24.0'
+PACKAGE_STRING='yast2-add-on-creator 2.24.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1247,7 +1247,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-add-on-creator 2.23.0 to adapt to many kinds of
systems.
+\`configure' configures yast2-add-on-creator 2.24.0 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1319,7 +1319,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-add-on-creator 2.23.0:";;
+ short | recursive ) echo "Configuration of yast2-add-on-creator 2.24.0:";;
esac
cat <<\_ACEOF
@@ -1399,7 +1399,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-add-on-creator configure 2.23.0
+yast2-add-on-creator configure 2.24.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1416,7 +1416,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-add-on-creator $as_me 2.23.0, which was
+It was created by yast2-add-on-creator $as_me 2.24.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2355,7 +2355,7 @@
# Define the identity of the package.
PACKAGE='yast2-add-on-creator'
- VERSION='2.23.0'
+ VERSION='2.24.0'
cat >>confdefs.h <<_ACEOF
@@ -2478,7 +2478,7 @@
-VERSION="2.23.0"
+VERSION="2.24.0"
RPMNAME="yast2-add-on-creator"
MAINTAINER="Jiri Suchomel <jsuch...@suse.cz>"
@@ -3404,7 +3404,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-add-on-creator $as_me 2.23.0, which was
+This file was extended by yast2-add-on-creator $as_me 2.24.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3457,7 +3457,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-add-on-creator config.status 2.23.0
+yast2-add-on-creator config.status 2.24.0
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-add-on-creator-2.23.0/configure.ac
new/yast2-add-on-creator-2.24.0/configure.ac
--- old/yast2-add-on-creator-2.23.0/configure.ac 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-add-on-creator-2.24.0/configure.ac 2013-07-24
12:15:33.000000000 +0200
@@ -0,0 +1,159 @@
+dnl configure.ac for yast2-add-on-creator
+dnl
+dnl -- This file is generated by y2autoconf 2.24.5 - DO NOT EDIT! --
+dnl (edit configure.ac.in or configure.in.in instead)
+
+AC_INIT(yast2-add-on-creator, 2.24.0, http://bugs.opensuse.org/,
yast2-add-on-creator)
+dnl Check for presence of file 'RPMNAME'
+AC_CONFIG_SRCDIR([RPMNAME])
+
+dnl Checking host/target/build systems, for make, install etc.
+AC_CANONICAL_TARGET
+dnl Perform program name transformation
+AC_ARG_PROGRAM
+
+AC_PREFIX_DEFAULT(/usr)
+
+dnl long filenames; we use GNU Make extensions and that's ok
+AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
+
+dnl Important YaST2 variables
+VERSION="2.24.0"
+RPMNAME="yast2-add-on-creator"
+MAINTAINER="Jiri Suchomel <jsuch...@suse.cz>"
+
+dnl pkgconfig honors lib64
+pkgconfigdir=\${libdir}/pkgconfig
+pkgconfigdatadir=\${datadir}/pkgconfig
+yast2dir=\${prefix}/share/YaST2
+
+ybindir=\${prefix}/lib/YaST2/bin
+# FIXME duplicates execcompdir
+ystartupdir=\${prefix}/lib/YaST2
+plugindir=\${libdir}/YaST2/plugin
+includedir=\${prefix}/include/YaST2
+potdir=\${docdir}/pot
+
+docdir=\${prefix}/share/doc/packages/$RPMNAME
+mandir=\${prefix}/share/man
+
+execcompdir=\${prefix}/lib/YaST2
+agentdir=${execcompdir}/servers_non_y2
+
+ydatadir=${yast2dir}/data
+imagedir=${yast2dir}/images
+themedir=${yast2dir}/theme
+localedir=${yast2dir}/locale
+clientdir=${yast2dir}/clients
+moduledir=${yast2dir}/modules
+yncludedir=${yast2dir}/include
+schemadir=${yast2dir}/schema
+scrconfdir=${yast2dir}/scrconf
+desktopdir=\${prefix}/share/applications/YaST2
+
+AC_SUBST(VERSION)
+AC_SUBST(RPMNAME)
+AC_SUBST(MAINTAINER)
+
+AC_SUBST(pkgconfigdir)
+AC_SUBST(pkgconfigdatadir)
+
+AC_SUBST(yast2dir)
+
+AC_SUBST(ybindir)
+AC_SUBST(ystartupdir)
+AC_SUBST(plugindir)
+AC_SUBST(includedir)
+AC_SUBST(potdir)
+AC_SUBST(execcompdir)
+
+AC_SUBST(docdir)
+AC_SUBST(mandir)
+
+AC_SUBST(ydatadir)
+AC_SUBST(imagedir)
+AC_SUBST(themedir)
+AC_SUBST(localedir)
+AC_SUBST(clientdir)
+AC_SUBST(moduledir)
+AC_SUBST(yncludedir)
+AC_SUBST(schemadir)
+AC_SUBST(scrconfdir)
+AC_SUBST(agentdir)
+AC_SUBST(desktopdir)
+
+fillupdir_d="/var/adm/fillup-templates"
+AC_ARG_WITH(fillupdir,
+ AS_HELP_STRING([--with-fillupdir=DIR],
+ [where to place fillup templates (default $fillupdir_d.]),
+ [ fillupdir="$withval" ],
+ [ fillupdir="$fillupdir_d" ])
+AC_SUBST(fillupdir)
+
+
+
+dnl Checks for programs.
+AC_PROG_INSTALL
+dnl The YCP interpreter checks whether dependent ybc files are older
+dnl so we must preserve their timestamps
+INSTALL="${INSTALL} -p"
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+
+dnl pkgconfig
+AC_ARG_VAR([PKG_CONFIG_PATH], [where to search for pkg-config files])
+dnl devtools
+dnl ...
+
+dnl no need for AC_ARG_VAR
+AC_PATH_PROG(XGETTEXT, xgettext)
+if test -z "$XGETTEXT" ; then
+ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
+fi
+
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
+devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
+devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir
yast2-devtools`
+
+dnl producing pkg-config for others?
+AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x)
+AM_CONDITIONAL(CREATE_PKGCONFIG_NOARCH, test "x${CREATE_PKGCONFIG}" = xnoarch)
+
+dbdir=${devtools_yast2dir}/data/docbook
+STYLESHEET_HTML=${dbdir}/stylesheets/customize-html.xsl
+STYLESHEET_PDF=${dbdir}/stylesheets/customize-fo.xsl
+STYLESHEET_CSS=${dbdir}/css/yast2docs.css
+STYLESHEET_YDOC=${dbdir}/stylesheets/ydoc.xsl
+STYLESHEET_YCPDOC=${dbdir}/stylesheets/ycpdoc.xsl
+AC_SUBST(STYLESHEET_HTML)
+AC_SUBST(STYLESHEET_PDF)
+AC_SUBST(STYLESHEET_CSS)
+AC_SUBST(STYLESHEET_YDOC)
+AC_SUBST(STYLESHEET_YCPDOC)
+
+
+AC_PATH_PROG(YCPDOC, ycpdoc, false, $PATH:$devtools_ybindir)
+if test "$YCPDOC" = "false"; then
+ AC_MSG_ERROR([ycpdoc is not installed])
+fi
+AC_PATH_PROG(YCPMAKEDEP, ycpmakedep, false, $PATH:$devtools_ybindir)
+if test "$YCPMAKEDEP" = "false"; then
+ AC_MSG_ERROR([ycpmakedep is not installed])
+fi
+AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir)
+if test "$YCPC" = "false"; then
+ AC_MSG_ERROR([ycpc is not installed])
+fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
+
+
+AC_CONFIG_FILES(Makefile agents/Makefile
+doc/autodocs/Makefile
+doc/Makefile
+src/Makefile
+testsuite/Makefile)
+AC_OUTPUT
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/configure.in
new/yast2-add-on-creator-2.24.0/configure.in
--- old/yast2-add-on-creator-2.23.0/configure.in 2012-12-07
09:11:20.000000000 +0100
+++ new/yast2-add-on-creator-2.24.0/configure.in 1970-01-01
01:00:00.000000000 +0100
@@ -1,159 +0,0 @@
-dnl configure.in for yast2-add-on-creator
-dnl
-dnl -- This file is generated by y2autoconf 2.23.1 - DO NOT EDIT! --
-dnl (edit configure.in.in instead)
-
-AC_INIT(yast2-add-on-creator, 2.23.0, http://bugs.opensuse.org/,
yast2-add-on-creator)
-dnl Check for presence of file 'RPMNAME'
-AC_CONFIG_SRCDIR([RPMNAME])
-
-dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_TARGET
-dnl Perform program name transformation
-AC_ARG_PROGRAM
-
-AC_PREFIX_DEFAULT(/usr)
-
-dnl long filenames; we use GNU Make extensions and that's ok
-AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
-
-dnl Important YaST2 variables
-VERSION="2.23.0"
-RPMNAME="yast2-add-on-creator"
-MAINTAINER="Jiri Suchomel <jsuch...@suse.cz>"
-
-dnl pkgconfig honors lib64
-pkgconfigdir=\${libdir}/pkgconfig
-pkgconfigdatadir=\${datadir}/pkgconfig
-yast2dir=\${prefix}/share/YaST2
-
-ybindir=\${prefix}/lib/YaST2/bin
-# FIXME duplicates execcompdir
-ystartupdir=\${prefix}/lib/YaST2
-plugindir=\${libdir}/YaST2/plugin
-includedir=\${prefix}/include/YaST2
-potdir=\${docdir}/pot
-
-docdir=\${prefix}/share/doc/packages/$RPMNAME
-mandir=\${prefix}/share/man
-
-execcompdir=\${prefix}/lib/YaST2
-agentdir=${execcompdir}/servers_non_y2
-
-ydatadir=${yast2dir}/data
-imagedir=${yast2dir}/images
-themedir=${yast2dir}/theme
-localedir=${yast2dir}/locale
-clientdir=${yast2dir}/clients
-moduledir=${yast2dir}/modules
-yncludedir=${yast2dir}/include
-schemadir=${yast2dir}/schema
-scrconfdir=${yast2dir}/scrconf
-desktopdir=\${prefix}/share/applications/YaST2
-
-AC_SUBST(VERSION)
-AC_SUBST(RPMNAME)
-AC_SUBST(MAINTAINER)
-
-AC_SUBST(pkgconfigdir)
-AC_SUBST(pkgconfigdatadir)
-
-AC_SUBST(yast2dir)
-
-AC_SUBST(ybindir)
-AC_SUBST(ystartupdir)
-AC_SUBST(plugindir)
-AC_SUBST(includedir)
-AC_SUBST(potdir)
-AC_SUBST(execcompdir)
-
-AC_SUBST(docdir)
-AC_SUBST(mandir)
-
-AC_SUBST(ydatadir)
-AC_SUBST(imagedir)
-AC_SUBST(themedir)
-AC_SUBST(localedir)
-AC_SUBST(clientdir)
-AC_SUBST(moduledir)
-AC_SUBST(yncludedir)
-AC_SUBST(schemadir)
-AC_SUBST(scrconfdir)
-AC_SUBST(agentdir)
-AC_SUBST(desktopdir)
-
-fillupdir_d="/var/adm/fillup-templates"
-AC_ARG_WITH(fillupdir,
- AS_HELP_STRING([--with-fillupdir=DIR],
- [where to place fillup templates (default $fillupdir_d.]),
- [ fillupdir="$withval" ],
- [ fillupdir="$fillupdir_d" ])
-AC_SUBST(fillupdir)
-
-
-
-dnl Checks for programs.
-AC_PROG_INSTALL
-dnl The YCP interpreter checks whether dependent ybc files are older
-dnl so we must preserve their timestamps
-INSTALL="${INSTALL} -p"
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-dnl pkgconfig
-AC_ARG_VAR([PKG_CONFIG_PATH], [where to search for pkg-config files])
-dnl devtools
-dnl ...
-
-dnl no need for AC_ARG_VAR
-AC_PATH_PROG(XGETTEXT, xgettext)
-if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
-fi
-
-Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
-AC_SUBST(Y2DEVTOOLS_PREFIX)
-devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
-devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir
yast2-devtools`
-
-dnl producing pkg-config for others?
-AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x)
-AM_CONDITIONAL(CREATE_PKGCONFIG_NOARCH, test "x${CREATE_PKGCONFIG}" = xnoarch)
-
-dbdir=${devtools_yast2dir}/data/docbook
-STYLESHEET_HTML=${dbdir}/stylesheets/customize-html.xsl
-STYLESHEET_PDF=${dbdir}/stylesheets/customize-fo.xsl
-STYLESHEET_CSS=${dbdir}/css/yast2docs.css
-STYLESHEET_YDOC=${dbdir}/stylesheets/ydoc.xsl
-STYLESHEET_YCPDOC=${dbdir}/stylesheets/ycpdoc.xsl
-AC_SUBST(STYLESHEET_HTML)
-AC_SUBST(STYLESHEET_PDF)
-AC_SUBST(STYLESHEET_CSS)
-AC_SUBST(STYLESHEET_YDOC)
-AC_SUBST(STYLESHEET_YCPDOC)
-
-
-AC_PATH_PROG(YCPDOC, ycpdoc, false, $PATH:$devtools_ybindir)
-if test "$YCPDOC" = "false"; then
- AC_MSG_ERROR([ycpdoc is not installed])
-fi
-AC_PATH_PROG(YCPMAKEDEP, ycpmakedep, false, $PATH:$devtools_ybindir)
-if test "$YCPMAKEDEP" = "false"; then
- AC_MSG_ERROR([ycpmakedep is not installed])
-fi
-AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir)
-if test "$YCPC" = "false"; then
- AC_MSG_ERROR([ycpc is not installed])
-fi
-AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
- AC_MSG_WARN([yast2-testsuite.rpm is not installed])
-])
-
-
-AC_CONFIG_FILES(Makefile agents/Makefile
-doc/autodocs/Makefile
-doc/Makefile
-src/Makefile
-testsuite/Makefile)
-AC_OUTPUT
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/doc/Makefile.in
new/yast2-add-on-creator-2.24.0/doc/Makefile.in
--- old/yast2-add-on-creator-2.23.0/doc/Makefile.in 2012-12-07
09:11:25.000000000 +0100
+++ new/yast2-add-on-creator-2.24.0/doc/Makefile.in 2013-07-24
12:15:38.000000000 +0200
@@ -56,7 +56,7 @@
subdir = doc
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/doc/autodocs/Makefile.in
new/yast2-add-on-creator-2.24.0/doc/autodocs/Makefile.in
--- old/yast2-add-on-creator-2.23.0/doc/autodocs/Makefile.in 2012-12-07
09:11:25.000000000 +0100
+++ new/yast2-add-on-creator-2.24.0/doc/autodocs/Makefile.in 2013-07-24
12:15:38.000000000 +0200
@@ -26,6 +26,8 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_RB: Files that the ruby autodocs is built from (using yard)
+# Optional - the default is $(srcdir)/../../src/modules/*.rb)
$(srcdir)/../../src/include/*/*.rb
# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
# Optional - the default is no subdir, $(docdir)/autodocs
# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
@@ -72,7 +74,7 @@
$(top_srcdir)/autodocs-ycp.ami
subdir = doc/autodocs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -113,7 +115,7 @@
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(htmldir)"
-DATA = $(html_DATA)
+DATA = $(nobase_html_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -232,8 +234,10 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
-html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
-CLEANFILES = $(html_DATA) pod2htm*.tmp
+
+# use nobase_ prefix to keep the directory structure
+nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
$(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*)
+CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp
all: all-am
.SUFFIXES:
@@ -268,26 +272,29 @@
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-install-htmlDATA: $(html_DATA)
+install-nobase_htmlDATA: $(nobase_html_DATA)
@$(NORMAL_INSTALL)
- @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
+ @list='$(nobase_html_DATA)'; test -n "$(htmldir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
$(MKDIR_P) "$(DESTDIR)$(htmldir)" || 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)$(htmldir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
+ $(am__nobase_list) | while read dir files; do \
+ xfiles=; for file in $$files; do \
+ if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+ else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+ test -z "$$xfiles" || { \
+ test "x$$dir" = x. || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$dir'"; \
+ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$dir"; }; \
+ echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(htmldir)/$$dir'"; \
+ $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(htmldir)/$$dir" || exit $$?;
}; \
done
-uninstall-htmlDATA:
+uninstall-nobase_htmlDATA:
@$(NORMAL_UNINSTALL)
- @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ @list='$(nobase_html_DATA)'; test -n "$(htmldir)" || list=; \
+ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -368,7 +375,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
distclean: distclean-am
-rm -f Makefile
@@ -386,7 +393,7 @@
info-am:
-install-data-am: install-htmlDATA
+install-data-am: install-nobase_htmlDATA
install-dvi: install-dvi-am
@@ -430,34 +437,46 @@
ps-am:
-uninstall-am: uninstall-htmlDATA
+uninstall-am: uninstall-nobase_htmlDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-htmlDATA install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-htmlDATA
+.PHONY: all all-am check check-am clean clean-generic clean-local \
+ distclean distclean-generic distdir dvi dvi-am html html-am \
+ info info-am install install-am install-data install-data-am \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-nobase_htmlDATA install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-nobase_htmlDATA
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_RB ?= $(wildcard $(srcdir)/../../src/modules/*.rb
$(srcdir)/../../src/include/*/*.rb)
AUTODOCS_STRIP ?= $(srcdir)/../../src
-index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+# yard specific options
+YARD ?= yard
+# use markdown format by default
+YARD_OPTIONS ?= -o . -m markdown
+
+# yard specific clean
+clean-local:
+ rm -rf js css Yast .yardoc
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) $(AUTODOCS_RB)
#including *.pm, for the index
- ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
+ if [ -n "$(AUTODOCS_YCP)" ]; then ${YCPDOC} -d. -s$(AUTODOCS_STRIP)
$(AUTODOCS_YCP); fi
for i in $(AUTODOCS_PM); do \
b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__};
b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
+ if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS)
$(AUTODOCS_RB); fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/src/Makefile.in
new/yast2-add-on-creator-2.24.0/src/Makefile.in
--- old/yast2-add-on-creator-2.23.0/src/Makefile.in 2012-12-07
09:11:25.000000000 +0100
+++ new/yast2-add-on-creator-2.24.0/src/Makefile.in 2013-07-24
12:15:38.000000000 +0200
@@ -60,7 +60,7 @@
$(top_srcdir)/Makefile.am.common
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -606,7 +606,7 @@
dist-hook: check-syntax
check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(client_DATA)"; then \
+ @if test "$(filter %.ycp,client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
echo "Checking syntax of $${TO_CHECK}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/src/complex.ycp
new/yast2-add-on-creator-2.24.0/src/complex.ycp
--- old/yast2-add-on-creator-2.23.0/src/complex.ycp 2012-12-07
09:05:57.000000000 +0100
+++ new/yast2-add-on-creator-2.24.0/src/complex.ycp 2013-07-24
10:06:44.000000000 +0200
@@ -429,16 +429,16 @@
requires == "SUSE_SLE-11")),
`Left (`RadioButton(`id ("SUSE_SLE-11.1"), `opt (`notify),
// radio button label
- _("SUSE Linux Enterprise 11 SP1"),
- requires == "SUSE_SLE-11.1")),
- `Left (`RadioButton(`id("openSUSE-11.4"), `opt (`notify),
+ _("SUSE Linux Enterprise 11 SP3"),
+ requires == "SUSE_SLE-11.3")),
+ `Left (`RadioButton(`id("openSUSE-12.3"), `opt (`notify),
// radio button label
- _("openSUSE 11.&4"),
- requires == "openSUSE-11.4")),
- `Left (`RadioButton(`id("openSUSE-12.1"), `opt (`notify),
+ _("openSUSE 12.&3"),
+ requires == "openSUSE-12.3")),
+ `Left (`RadioButton(`id("openSUSE-13.1"), `opt (`notify),
// radio button label
- _("openSUSE 12.1"),
- requires == "openSUSE-12.1")),
+ _("openSUSE 13.1"),
+ requires == "openSUSE-13.1")),
`HBox (
`Left(`RadioButton(`id(`other), `opt (`notify),
// radio button label
@@ -1982,7 +1982,7 @@
AddOnCreator::current_product["iso"] = iso;
AddOnCreator::current_product["iso_name"] = iso_name;
AddOnCreator::current_product["changelog"] = changelog;
- if (iso && !Package::Install ("mkisofs"))
+ if (iso && !Package::Install ("cdrkit-cdrtools-compat"))
{
UI::ChangeWidget (`id(`iso), `Value, false);
ret = `notnext;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-creator-2.23.0/testsuite/Makefile.in
new/yast2-add-on-creator-2.24.0/testsuite/Makefile.in
--- old/yast2-add-on-creator-2.23.0/testsuite/Makefile.in 2012-12-07
09:11:25.000000000 +0100
+++ new/yast2-add-on-creator-2.24.0/testsuite/Makefile.in 2013-07-24
12:15:38.000000000 +0200
@@ -59,7 +59,7 @@
subdir = testsuite
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
