Hello community,
here is the log from the commit of package yast2-devtools for openSUSE:Factory
checked in at 2013-08-23 11:06:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-12 11:04:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes
2013-08-23 11:06:37.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Aug 13 12:42:04 UTC 2013 - lsle...@suse.cz
+
+- correctly handle yard documentation in Yast/ subdirectories
+- 3.0.4
+
+-------------------------------------------------------------------
+Fri Aug 9 08:53:18 UTC 2013 - lsle...@suse.cz
+
+- Makefile.am.common - do not create empty ".dep" YCP dependency
+ file when there is no YCP module file
+- 3.0.3
+
+-------------------------------------------------------------------
Old:
----
yast2-devtools-3.0.2.tar.bz2
New:
----
yast2-devtools-3.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-devtools.spec ++++++
--- /var/tmp/diff_new_pack.bX3z7G/_old 2013-08-23 11:06:38.000000000 +0200
+++ /var/tmp/diff_new_pack.bX3z7G/_new 2013-08-23 11:06:38.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-devtools
-Version: 3.0.2
+Version: 3.0.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-devtools-3.0.2.tar.bz2 -> yast2-devtools-3.0.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-devtools-3.0.2/Makefile.am.common
new/yast2-devtools-3.0.4/Makefile.am.common
--- old/yast2-devtools-3.0.2/Makefile.am.common 2013-08-07 17:55:18.000000000
+0200
+++ new/yast2-devtools-3.0.4/Makefile.am.common 2013-08-13 15:22:34.000000000
+0200
@@ -15,6 +15,7 @@
CLEANFILES = ${ybcfiles}
DISTCLEANFILES = .dep
+if HAS_YCP_MODULES
# Needs to be outside "." because of cases
# where ycpchook contains a symlink to "."
# Otherwise "." keeps being newer than .dep and we loop.
@@ -26,6 +27,8 @@
${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
cat ${NEWDEP} > .dep
rm ${NEWDEP}
+-include .dep
+endif
dist-hook: check-syntax
@@ -58,4 +61,3 @@
fi; \
fi
--include .dep
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-devtools-3.0.2/VERSION
new/yast2-devtools-3.0.4/VERSION
--- old/yast2-devtools-3.0.2/VERSION 2013-08-07 16:31:33.000000000 +0200
+++ new/yast2-devtools-3.0.4/VERSION 2013-08-13 15:22:27.000000000 +0200
@@ -1 +1 @@
-3.0.2
+3.0.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-devtools-3.0.2/configure
new/yast2-devtools-3.0.4/configure
--- old/yast2-devtools-3.0.2/configure 2013-08-07 17:55:33.000000000 +0200
+++ new/yast2-devtools-3.0.4/configure 2013-08-13 15:22:44.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.2.
+# Generated by GNU Autoconf 2.69 for yast2-devtools 3.0.4.
#
# 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.2'
-PACKAGE_STRING='yast2-devtools 3.0.2'
+PACKAGE_VERSION='3.0.4'
+PACKAGE_STRING='yast2-devtools 3.0.4'
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.2 to adapt to many kinds of systems.
+\`configure' configures yast2-devtools 3.0.4 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.2:";;
+ short | recursive ) echo "Configuration of yast2-devtools 3.0.4:";;
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.2
+yast2-devtools configure 3.0.4
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.2, which was
+It was created by yast2-devtools $as_me 3.0.4, 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.2'
+ VERSION='3.0.4'
cat >>confdefs.h <<_ACEOF
@@ -3032,7 +3032,7 @@
-VERSION="3.0.2"
+VERSION="3.0.4"
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.2, which was
+This file was extended by yast2-devtools $as_me 3.0.4, 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.2
+yast2-devtools config.status 3.0.4
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.2/configure.ac
new/yast2-devtools-3.0.4/configure.ac
--- old/yast2-devtools-3.0.2/configure.ac 2013-08-07 17:55:18.000000000
+0200
+++ new/yast2-devtools-3.0.4/configure.ac 2013-08-13 15:22:34.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.ac for yast2-devtools
dnl
-dnl -- This file is generated by y2autoconf 3.0.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! --
dnl (edit configure.ac.in or configure.in.in instead)
-AC_INIT(yast2-devtools, 3.0.2, http://bugs.opensuse.org/, yast2-devtools)
+AC_INIT(yast2-devtools, 3.0.4, 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.2"
+VERSION="3.0.4"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner <mvid...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-devtools-3.0.2/devtools/admin/Makefile.am.common
new/yast2-devtools-3.0.4/devtools/admin/Makefile.am.common
--- old/yast2-devtools-3.0.2/devtools/admin/Makefile.am.common 2013-08-02
16:46:46.000000000 +0200
+++ new/yast2-devtools-3.0.4/devtools/admin/Makefile.am.common 2013-08-13
09:51:47.000000000 +0200
@@ -15,6 +15,7 @@
CLEANFILES = ${ybcfiles}
DISTCLEANFILES = .dep
+if HAS_YCP_MODULES
# Needs to be outside "." because of cases
# where ycpchook contains a symlink to "."
# Otherwise "." keeps being newer than .dep and we loop.
@@ -26,6 +27,8 @@
${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
cat ${NEWDEP} > .dep
rm ${NEWDEP}
+-include .dep
+endif
dist-hook: check-syntax
@@ -58,4 +61,3 @@
fi; \
fi
--include .dep
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-devtools-3.0.2/devtools/admin/aminclude/autodocs-ycp.ami
new/yast2-devtools-3.0.4/devtools/admin/aminclude/autodocs-ycp.ami
--- old/yast2-devtools-3.0.2/devtools/admin/aminclude/autodocs-ycp.ami
2013-07-29 09:48:32.000000000 +0200
+++ new/yast2-devtools-3.0.4/devtools/admin/aminclude/autodocs-ycp.ami
2013-08-13 15:22:27.000000000 +0200
@@ -17,8 +17,11 @@
htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
+# find all files in Yast/ subdirectory if it exists
+YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f)
+
# 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/*)
+nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
$(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES)
CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-devtools-3.0.2/devtools/bin/version
new/yast2-devtools-3.0.4/devtools/bin/version
--- old/yast2-devtools-3.0.2/devtools/bin/version 2013-08-07
17:55:45.000000000 +0200
+++ new/yast2-devtools-3.0.4/devtools/bin/version 2013-08-13
15:22:55.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/bash
-echo 3.0.2
+echo 3.0.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-devtools-3.0.2/devtools/bin/y2autoconf
new/yast2-devtools-3.0.4/devtools/bin/y2autoconf
--- old/yast2-devtools-3.0.2/devtools/bin/y2autoconf 2013-07-18
14:33:04.000000000 +0200
+++ new/yast2-devtools-3.0.4/devtools/bin/y2autoconf 2013-08-13
09:51:47.000000000 +0200
@@ -390,6 +390,19 @@
AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
AC_MSG_WARN([yast2-testsuite.rpm is not installed])
])
+
+# handle .dep files in Makefile.am.common if any YCP module is present
+AC_MSG_CHECKING([for YCP modules])
+
+# YCP module file name starts with an upper case letter
+[find . -type f | grep -q "[[:upper:]][^/]*\\.ycp$" && has_ycp_modules=1]
+AM_CONDITIONAL([HAS_YCP_MODULES], [test -n "$has_ycp_modules"])
+
+if test -n "$has_ycp_modules"; then
+ AC_MSG_RESULT([found])
+else
+ AC_MSG_RESULT([not found])
+fi
',
# generate output
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
