Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2013-07-29 17:52:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2013-07-19 11:16:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2013-07-29 17:52:03.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 24 11:15:24 UTC 2013 - [email protected] + +- split the generated documentation to devel-doc subpackge (to save + some space in installed system, needed only for developers) +- 2.24.2 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.24.1.tar.bz2 New: ---- yast2-packager-2.24.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.pF1D4q/_old 2013-07-29 17:52:04.000000000 +0200 +++ /var/tmp/diff_new_pack.pF1D4q/_new 2013-07-29 17:52:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 2.24.1 +Version: 2.24.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -101,14 +101,22 @@ Summary: YaST2 - Webpin package search client Group: System/YaST +%package devel-doc +Requires: yast2-packager = %version +Summary: YaST2 - Development Documentation +Group: System/YaST + %description -This package contains the scanner/parser and dependency checker for all -packages handled by YaST2. +This package contains the libraries and modules for software management. %description webpin This package contains a client for searching packages in online repositories (webpin) and installing them via OneClickInstall +%description devel-doc +This package contains development documentation for using the API +provided by this package. + %prep %setup -n yast2-packager-%{version} @@ -150,6 +158,8 @@ %{_prefix}/share/applications/YaST2/*.desktop /usr/share/YaST2/scrconf/* %{_prefix}/lib/YaST2/servers_non_y2/ag_* + +%files devel-doc %doc %{_prefix}/share/doc/packages/yast2-packager %files webpin ++++++ yast2-packager-2.24.1.tar.bz2 -> yast2-packager-2.24.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.24.1/Makefile.in new/yast2-packager-2.24.2/Makefile.in --- old/yast2-packager-2.24.1/Makefile.in 2013-07-16 17:58:40.000000000 +0200 +++ new/yast2-packager-2.24.2/Makefile.in 2013-07-24 14:08:41.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 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.24.1/VERSION new/yast2-packager-2.24.2/VERSION --- old/yast2-packager-2.24.1/VERSION 2013-07-15 16:55:54.000000000 +0200 +++ new/yast2-packager-2.24.2/VERSION 2013-07-24 14:08:28.000000000 +0200 @@ -1 +1 @@ -2.24.1 +2.24.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.24.1/agents/Makefile.in new/yast2-packager-2.24.2/agents/Makefile.in --- old/yast2-packager-2.24.1/agents/Makefile.in 2013-07-16 17:58:40.000000000 +0200 +++ new/yast2-packager-2.24.2/agents/Makefile.in 2013-07-24 14:08:41.000000000 +0200 @@ -59,7 +59,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-packager-2.24.1/autodocs-ycp.ami new/yast2-packager-2.24.2/autodocs-ycp.ami --- old/yast2-packager-2.24.1/autodocs-ycp.ami 2013-07-16 17:58:35.000000000 +0200 +++ new/yast2-packager-2.24.2/autodocs-ycp.ami 2013-07-24 14:08:35.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,14 +17,26 @@ 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 if [ -n "$(AUTODOCS_YCP)" ]; then ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP); fi for i in $(AUTODOCS_PM); do \ @@ -30,3 +44,4 @@ 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-packager-2.24.1/configure new/yast2-packager-2.24.2/configure --- old/yast2-packager-2.24.1/configure 2013-07-16 17:58:39.000000000 +0200 +++ new/yast2-packager-2.24.2/configure 2013-07-24 14:08:40.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-packager 2.24.1. +# Generated by GNU Autoconf 2.69 for yast2-packager 2.24.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.24.1' -PACKAGE_STRING='yast2-packager 2.24.1' +PACKAGE_VERSION='2.24.2' +PACKAGE_STRING='yast2-packager 2.24.2' 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-packager 2.24.1 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.24.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.24.1:";; + short | recursive ) echo "Configuration of yast2-packager 2.24.2:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.24.1 +yast2-packager configure 2.24.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1415,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-packager $as_me 2.24.1, which was +It was created by yast2-packager $as_me 2.24.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2354,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.24.1' + VERSION='2.24.2' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2477,7 @@ -VERSION="2.24.1" +VERSION="2.24.2" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <[email protected]>" @@ -3403,7 +3403,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.24.1, which was +This file was extended by yast2-packager $as_me 2.24.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3456,7 +3456,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-packager config.status 2.24.1 +yast2-packager config.status 2.24.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-packager-2.24.1/configure.ac new/yast2-packager-2.24.2/configure.ac --- old/yast2-packager-2.24.1/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.24.2/configure.ac 2013-07-24 14:08:35.000000000 +0200 @@ -0,0 +1,164 @@ +dnl configure.ac for yast2-packager +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-packager, 2.24.2, http://bugs.opensuse.org/, yast2-packager) +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.2" +RPMNAME="yast2-packager" +MAINTAINER="Ladislav Slezak <[email protected]>" + +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/clients/Makefile +src/modules/Makefile +src/config/Makefile +src/include/checkmedia/Makefile +src/include/Makefile +src/Makefile +testsuite/Makefile) +AC_OUTPUT + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.24.1/configure.in new/yast2-packager-2.24.2/configure.in --- old/yast2-packager-2.24.1/configure.in 2013-07-16 17:58:35.000000000 +0200 +++ new/yast2-packager-2.24.2/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,164 +0,0 @@ -dnl configure.in for yast2-packager -dnl -dnl -- This file is generated by y2autoconf 2.24.2 - DO NOT EDIT! -- -dnl (edit configure.in.in instead) - -AC_INIT(yast2-packager, 2.24.1, http://bugs.opensuse.org/, yast2-packager) -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.1" -RPMNAME="yast2-packager" -MAINTAINER="Ladislav Slezak <[email protected]>" - -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/clients/Makefile -src/modules/Makefile -src/config/Makefile -src/include/checkmedia/Makefile -src/include/Makefile -src/Makefile -testsuite/Makefile) -AC_OUTPUT - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.24.1/doc/Makefile.in new/yast2-packager-2.24.2/doc/Makefile.in --- old/yast2-packager-2.24.1/doc/Makefile.in 2013-07-16 17:58:40.000000000 +0200 +++ new/yast2-packager-2.24.2/doc/Makefile.in 2013-07-24 14:08:41.000000000 +0200 @@ -60,7 +60,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-packager-2.24.1/doc/autodocs/Makefile.in new/yast2-packager-2.24.2/doc/autodocs/Makefile.in --- old/yast2-packager-2.24.1/doc/autodocs/Makefile.in 2013-07-16 17:58:40.000000000 +0200 +++ new/yast2-packager-2.24.2/doc/autodocs/Makefile.in 2013-07-24 14:08:41.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@ @@ -234,8 +236,10 @@ ystartupdir = @ystartupdir@ AUTODOCS_YCP = $(wildcard $(srcdir)/../../src/*/*.ycp) AUTODOCS_PM = $(wildcard $(srcdir)/../../src/*/*.pm) -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: @@ -270,26 +274,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: @@ -370,7 +377,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 @@ -388,7 +395,7 @@ info-am: -install-data-am: install-htmlDATA +install-data-am: install-nobase_htmlDATA install-dvi: install-dvi-am @@ -432,27 +439,38 @@ 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 if [ -n "$(AUTODOCS_YCP)" ]; then ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP); fi for i in $(AUTODOCS_PM); do \ @@ -460,6 +478,7 @@ 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-packager-2.24.1/src/Makefile.in new/yast2-packager-2.24.2/src/Makefile.in --- old/yast2-packager-2.24.1/src/Makefile.in 2013-07-16 17:58:40.000000000 +0200 +++ new/yast2-packager-2.24.2/src/Makefile.in 2013-07-24 14:08:41.000000000 +0200 @@ -57,7 +57,7 @@ subdir = src 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-packager-2.24.1/src/clients/Makefile.in new/yast2-packager-2.24.2/src/clients/Makefile.in --- old/yast2-packager-2.24.1/src/clients/Makefile.in 2013-07-16 17:58:40.000000000 +0200 +++ new/yast2-packager-2.24.2/src/clients/Makefile.in 2013-07-24 14:08:41.000000000 +0200 @@ -62,7 +62,7 @@ $(top_srcdir)/Makefile.am.common subdir = src/clients 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-packager-2.24.1/src/config/Makefile.in new/yast2-packager-2.24.2/src/config/Makefile.in --- old/yast2-packager-2.24.1/src/config/Makefile.in 2013-07-16 17:58:40.000000000 +0200 +++ new/yast2-packager-2.24.2/src/config/Makefile.in 2013-07-24 14:08:41.000000000 +0200 @@ -60,7 +60,7 @@ $(top_srcdir)/Makefile.am.common subdir = src/config 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-packager-2.24.1/src/include/Makefile.in new/yast2-packager-2.24.2/src/include/Makefile.in --- old/yast2-packager-2.24.1/src/include/Makefile.in 2013-07-16 17:58:40.000000000 +0200 +++ new/yast2-packager-2.24.2/src/include/Makefile.in 2013-07-24 14:08:41.000000000 +0200 @@ -58,7 +58,7 @@ subdir = src/include 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-packager-2.24.1/src/include/checkmedia/Makefile.in new/yast2-packager-2.24.2/src/include/checkmedia/Makefile.in --- old/yast2-packager-2.24.1/src/include/checkmedia/Makefile.in 2013-07-16 17:58:40.000000000 +0200 +++ new/yast2-packager-2.24.2/src/include/checkmedia/Makefile.in 2013-07-24 14:08:41.000000000 +0200 @@ -58,7 +58,7 @@ subdir = src/include/checkmedia 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-packager-2.24.1/src/modules/Makefile.in new/yast2-packager-2.24.2/src/modules/Makefile.in --- old/yast2-packager-2.24.1/src/modules/Makefile.in 2013-07-16 17:58:40.000000000 +0200 +++ new/yast2-packager-2.24.2/src/modules/Makefile.in 2013-07-24 14:08:41.000000000 +0200 @@ -60,7 +60,7 @@ $(top_srcdir)/Makefile.am.common subdir = src/modules 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-packager-2.24.1/testsuite/Makefile.in new/yast2-packager-2.24.2/testsuite/Makefile.in --- old/yast2-packager-2.24.1/testsuite/Makefile.in 2013-07-16 17:58:40.000000000 +0200 +++ new/yast2-packager-2.24.2/testsuite/Makefile.in 2013-07-24 14:08:41.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: [email protected] For additional commands, e-mail: [email protected]
