Hello community,
here is the log from the commit of package yast2-devtools
checked in at Fri Feb 8 17:20:27 CET 2008.
--------
--- yast2-devtools/yast2-devtools.changes 2008-02-01 17:12:56.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-devtools/yast2-devtools.changes 2008-02-08 16:10:56.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 8 16:10:41 CET 2008 - coolo@suse.de
+
+- enhance cmake macros for tar generation
+- 2.16.5
+
+-------------------------------------------------------------------
Old:
----
yast2-devtools-2.16.4.tar.bz2
New:
----
yast2-devtools-2.16.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-devtools.spec ++++++
--- /var/tmp/diff_new_pack.a10425/_old 2008-02-08 17:17:49.000000000 +0100
+++ /var/tmp/diff_new_pack.a10425/_new 2008-02-08 17:17:49.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-devtools (Version 2.16.4)
+# spec file for package yast2-devtools (Version 2.16.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-devtools
-Version: 2.16.4
+Version: 2.16.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-devtools-2.16.4.tar.bz2
+Source0: yast2-devtools-2.16.5.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets gcc-c++ libxslt perl-XML-Writer pkgconfig sgml-skel
Requires: perl
@@ -53,7 +53,7 @@
Michal Svec
%prep
-%setup -n yast2-devtools-2.16.4
+%setup -n yast2-devtools-2.16.5
%build
autoreconf --force --install
@@ -93,6 +93,9 @@
%{prefix}/share/pkgconfig/yast2-devtools.pc
%doc %{prefix}/share/doc/packages/yast2-devtools
%changelog
+* Fri Feb 08 2008 coolo@suse.de
+- enhance cmake macros for tar generation
+- 2.16.5
* Fri Feb 01 2008 mvidner@suse.cz
- Require autotools, gettext-tools, recommend cmake (bnc#356996).
- y2makepot: look for gettext() in addition to _() and __() (bnc#354678).
++++++ yast2-devtools-2.16.4.tar.bz2 -> yast2-devtools-2.16.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.4/configure new/yast2-devtools-2.16.5/configure
--- old/yast2-devtools-2.16.4/configure 2008-02-01 17:13:52.000000000 +0100
+++ new/yast2-devtools-2.16.5/configure 2007-12-02 21:37:10.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-devtools 2.16.4.
+# Generated by GNU Autoconf 2.61 for yast2-devtools 2.16.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-devtools'
PACKAGE_TARNAME='yast2-devtools'
-PACKAGE_VERSION='2.16.4'
-PACKAGE_STRING='yast2-devtools 2.16.4'
+PACKAGE_VERSION='2.16.3'
+PACKAGE_STRING='yast2-devtools 2.16.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1449,7 +1449,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 2.16.4 to adapt to many kinds of systems.
+\`configure' configures yast2-devtools 2.16.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1520,7 +1520,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-devtools 2.16.4:";;
+ short | recursive ) echo "Configuration of yast2-devtools 2.16.3:";;
esac
cat <<\_ACEOF
@@ -1629,7 +1629,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-devtools configure 2.16.4
+yast2-devtools configure 2.16.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1643,7 +1643,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 2.16.4, which was
+It was created by yast2-devtools $as_me 2.16.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2464,7 +2464,7 @@
# Define the identity of the package.
PACKAGE='yast2-devtools'
- VERSION='2.16.4'
+ VERSION='2.16.3'
cat >>confdefs.h <<_ACEOF
@@ -2692,7 +2692,7 @@
-VERSION="2.16.4"
+VERSION="2.16.3"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner "
@@ -2943,8 +2943,8 @@
if test -z "$XGETTEXT" ; then
- { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-tools." >&5
-echo "$as_me: error: xgettext is missing; please install gettext-tools." >&2;}
+ { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-devel." >&5
+echo "$as_me: error: xgettext is missing; please install gettext-devel." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -20654,7 +20654,7 @@
ac_config_files="$ac_config_files devtools/bin/version"
-ac_config_files="$ac_config_files Makefile devtools/bin/Makefile devtools/admin/po/Makefile devtools/admin/copyright/yast/Makefile devtools/admin/copyright/gpl/Makefile devtools/admin/copyright/Makefile devtools/admin/aclocal/Makefile devtools/admin/aminclude/Makefile devtools/admin/Makefile devtools/skeletons/Makefile devtools/doc/skeletons/config/Makefile devtools/doc/skeletons/Makefile devtools/doc/Makefile devtools/data/Makefile devtools/cmake/modules/Makefile devtools/cmake/Makefile devtools/Makefile docbook/stylesheets/Makefile docbook/css/Makefile docbook/images/navig/Makefile docbook/images/admon/Makefile docbook/images/Makefile docbook/Makefile doxygen/Makefile scrdoc/doc/Makefile scrdoc/src/Makefile scrdoc/Makefile yast2/check_ycp/doc/Makefile yast2/check_ycp/Makefile yast2/Makefile ycpdoc/doc/example/Makefile ycpdoc/doc/Makefile ycpdoc/src/Makefile ycpdoc/testsuite/Makefile ycpdoc/Makefile ydoc/doc/Makefile ydoc/src/Makefile ydoc/po-tools/Makefile ydoc/Makefile y2logview/y2log_ana/Makefile y2logview/Makefile"
+ac_config_files="$ac_config_files Makefile devtools/bin/Makefile devtools/admin/po/Makefile devtools/admin/copyright/yast/Makefile devtools/admin/copyright/gpl/Makefile devtools/admin/copyright/Makefile devtools/admin/aclocal/Makefile devtools/admin/aminclude/Makefile devtools/admin/Makefile devtools/skeletons/Makefile devtools/doc/skeletons/config/Makefile devtools/doc/skeletons/Makefile devtools/doc/Makefile devtools/data/Makefile devtools/cmake/modules/Makefile devtools/cmake/Makefile devtools/Makefile docbook/stylesheets/Makefile docbook/css/Makefile docbook/images/navig/Makefile docbook/images/admon/Makefile docbook/images/Makefile docbook/Makefile doxygen/Makefile scrdoc/doc/Makefile scrdoc/src/Makefile scrdoc/Makefile y2logview/y2log_ana/Makefile y2logview/Makefile yast2/check_ycp/doc/Makefile yast2/check_ycp/Makefile yast2/Makefile ycpdoc/doc/example/Makefile ycpdoc/doc/Makefile ycpdoc/src/Makefile ycpdoc/testsuite/Makefile ycpdoc/Makefile ydoc/doc/Makefile ydoc/src/Makefile ydoc/po-tools/Makefile ydoc/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -21138,7 +21138,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 2.16.4, which was
+This file was extended by yast2-devtools $as_me 2.16.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21185,7 +21185,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-devtools config.status 2.16.4
+yast2-devtools config.status 2.16.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21319,6 +21319,8 @@
"scrdoc/doc/Makefile") CONFIG_FILES="$CONFIG_FILES scrdoc/doc/Makefile" ;;
"scrdoc/src/Makefile") CONFIG_FILES="$CONFIG_FILES scrdoc/src/Makefile" ;;
"scrdoc/Makefile") CONFIG_FILES="$CONFIG_FILES scrdoc/Makefile" ;;
+ "y2logview/y2log_ana/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/y2log_ana/Makefile" ;;
+ "y2logview/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/Makefile" ;;
"yast2/check_ycp/doc/Makefile") CONFIG_FILES="$CONFIG_FILES yast2/check_ycp/doc/Makefile" ;;
"yast2/check_ycp/Makefile") CONFIG_FILES="$CONFIG_FILES yast2/check_ycp/Makefile" ;;
"yast2/Makefile") CONFIG_FILES="$CONFIG_FILES yast2/Makefile" ;;
@@ -21331,8 +21333,6 @@
"ydoc/src/Makefile") CONFIG_FILES="$CONFIG_FILES ydoc/src/Makefile" ;;
"ydoc/po-tools/Makefile") CONFIG_FILES="$CONFIG_FILES ydoc/po-tools/Makefile" ;;
"ydoc/Makefile") CONFIG_FILES="$CONFIG_FILES ydoc/Makefile" ;;
- "y2logview/y2log_ana/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/y2log_ana/Makefile" ;;
- "y2logview/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/Makefile" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.4/configure.in new/yast2-devtools-2.16.5/configure.in
--- old/yast2-devtools-2.16.4/configure.in 2008-02-01 17:13:39.000000000 +0100
+++ new/yast2-devtools-2.16.5/configure.in 2007-12-02 21:37:03.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-devtools
dnl
-dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-devtools, 2.16.4, http://bugs.opensuse.org/, yast2-devtools)
+AC_INIT(yast2-devtools, 2.16.3, 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="2.16.4"
+VERSION="2.16.3"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner "
@@ -117,7 +117,7 @@
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.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
@@ -211,6 +211,8 @@
scrdoc/doc/Makefile
scrdoc/src/Makefile
scrdoc/Makefile
+y2logview/y2log_ana/Makefile
+y2logview/Makefile
yast2/check_ycp/doc/Makefile
yast2/check_ycp/Makefile
yast2/Makefile
@@ -222,8 +224,6 @@
ydoc/doc/Makefile
ydoc/src/Makefile
ydoc/po-tools/Makefile
-ydoc/Makefile
-y2logview/y2log_ana/Makefile
-y2logview/Makefile)
+ydoc/Makefile)
AC_OUTPUT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.4/devtools/bin/showy2log new/yast2-devtools-2.16.5/devtools/bin/showy2log
--- old/yast2-devtools-2.16.4/devtools/bin/showy2log 2007-09-18 16:55:51.000000000 +0200
+++ new/yast2-devtools-2.16.5/devtools/bin/showy2log 2007-12-02 20:13:14.000000000 +0100
@@ -41,7 +41,7 @@
my $debuglvl = 0;
my $vcs_id = '$Id: showy2log 40869 2007-09-12 11:50:09Z dfiser $';
-my $vcs_date = '$Date: 2007-09-12 13:50:09 +0200 (St, 12 zář 2007) $';
+my $vcs_date = '$Date: 2007-09-12 13:50:09 +0200 (Mi, 12 Sep 2007) $';
$vcs_id =~ /^\$[[:alpha:]]+: [^ ]+ ([^ ]+ [^ ]+ [^ ]+) [^ ]+.*$/;
my $version = $1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.4/devtools/bin/version new/yast2-devtools-2.16.5/devtools/bin/version
--- old/yast2-devtools-2.16.4/devtools/bin/version 2008-02-01 17:14:11.000000000 +0100
+++ new/yast2-devtools-2.16.5/devtools/bin/version 2007-12-03 11:01:01.000000000 +0100
@@ -1,5 +1,5 @@
#!/bin/bash
-echo 2.16.4
+echo 2.16.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.4/devtools/cmake/Makefile.in new/yast2-devtools-2.16.5/devtools/cmake/Makefile.in
--- old/yast2-devtools-2.16.4/devtools/cmake/Makefile.in 2008-02-01 17:13:54.000000000 +0100
+++ new/yast2-devtools-2.16.5/devtools/cmake/Makefile.in 2007-12-02 21:37:12.000000000 +0100
@@ -37,7 +37,7 @@
host_triplet = @host@
target_triplet = @target@
subdir = devtools/cmake
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.in
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.4/devtools/cmake/modules/YastCommon.cmake new/yast2-devtools-2.16.5/devtools/cmake/modules/YastCommon.cmake
--- old/yast2-devtools-2.16.4/devtools/cmake/modules/YastCommon.cmake 2008-01-31 14:05:17.000000000 +0100
+++ new/yast2-devtools-2.16.5/devtools/cmake/modules/YastCommon.cmake 2008-02-08 13:04:39.000000000 +0100
@@ -52,51 +52,101 @@
make install DESTDIR=\"$RPM_BUILD_ROOT\""
)
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${RPMNAME}.spec.in ${CMAKE_BINARY_DIR}/package/${RPMNAME}.spec @ONLY)
-####################################################################
-
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "-")
-SET(CPACK_PACKAGE_VENDOR "-")
-SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
-SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
-SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
-
-SET( CPACK_GENERATOR "TBZ2")
-SET( CPACK_SOURCE_GENERATOR "TBZ2")
-SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${RPMNAME}-${VERSION}" )
-
-# The following components are regex's to match anywhere (unless anchored)
-# in absolute path + filename to find files or directories to be excluded
-# from source tarball.
-SET (CPACK_SOURCE_IGNORE_FILES
-"/CVS/;/.svn/;/.libs/;/.deps/;.swp$;.#;/#;/build/"
-"~$"
-"\\\\.cvsignore$"
-"/package"
-"Makefile\\\\.in$"
-)
-INCLUDE(CPack)
-
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-ADD_CUSTOM_TARGET( svncheck
- COMMAND cd $(CMAKE_SOURCE_DIR) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision'
-)
-
-SET( AUTOBUILD_COMMAND
- COMMAND ${CMAKE_MAKE_PROGRAM} package_source
- COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package
- COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2
- COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${RPMNAME}.changes" "${CMAKE_BINARY_DIR}/package/${RPMNAME}.changes"
-)
-
-ADD_CUSTOM_TARGET( srcpackage_local
- ${AUTOBUILD_COMMAND}
-)
+####################################################################
+# RPM SPEC #
+####################################################################
-ADD_CUSTOM_TARGET( srcpackage
- COMMAND ${CMAKE_MAKE_PROGRAM} svncheck
- ${AUTOBUILD_COMMAND}
-)
+MACRO(SPECFILE)
+ MESSAGE(STATUS "Writing spec file...")
+
+ SET(SPECIN ${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.cmake)
+ IF (NOT EXISTS ${SPECIN})
+ SET(SPECIN ${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.in)
+ ENDIF (NOT EXISTS ${SPECIN})
+
+ CONFIGURE_FILE(${SPECIN} ${CMAKE_BINARY_DIR}/package/${PACKAGE}.spec @ONLY)
+ MESSAGE(STATUS "I hate you rpm-lint...!!!")
+ IF (EXISTS ${CMAKE_SOURCE_DIR}/package/${PACKAGE}-rpmlint.cmake)
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/package/${PACKAGE}-rpmlint.cmake ${CMAKE_BINARY_DIR}/package/${PACKAGE}-rpmlintrc @ONLY)
+ ENDIF (EXISTS ${CMAKE_SOURCE_DIR}/package/${PACKAGE}-rpmlint.cmake)
+ENDMACRO(SPECFILE)
+
+MACRO(PKGCONFGFILE)
+ MESSAGE(STATUS "Writing pkg-config file...")
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PACKAGE}.pc.cmake ${CMAKE_BINARY_DIR}/${PACKAGE}.pc @ONLY)
+ INSTALL( FILES ${CMAKE_BINARY_DIR}/${PACKAGE}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
+ENDMACRO(PKGCONFGFILE)
+
+MACRO(GENERATE_PACKAGING PACKAGE VERSION)
+ # The following components are regex's to match anywhere (unless anchored)
+ # in absolute path + filename to find files or directories to be excluded
+ # from source tarball.
+ SET (CPACK_SOURCE_IGNORE_FILES
+ #svn files
+ "\\\\.svn/"
+ "\\\\.cvsignore$"
+ # temporary files
+ "\\\\.swp$"
+ # backup files
+ "~$"
+ # eclipse files
+ "\\\\.cdtproject$"
+ "\\\\.cproject$"
+ "\\\\.project$"
+ "\\\\.settings/"
+ # others
+ "\\\\.#"
+ "/#"
+ "/build/"
+ "/_build/"
+ "/\\\\.git/"
+ # used before
+ "/CVS/"
+ "/\\\\.libs/"
+ "/\\\\.deps/"
+ "\\\\.o$"
+ "\\\\.lo$"
+ "\\\\.la$"
+ "Makefile\\\\.in$"
+ )
+
+ #SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Novell's package management core engine.")
+ SET(CPACK_PACKAGE_VENDOR "Novell Inc.")
+ #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")
+ #SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
+ #SET(CPACK_PACKAGE_VERSION_MAJOR ${version_major})
+ #SET(CPACK_PACKAGE_VERSION_MINOR ${version_minor})
+ #SET(CPACK_PACKAGE_VERSION_PATCH ${version_patch})
+ SET( CPACK_GENERATOR "TBZ2")
+ SET( CPACK_SOURCE_GENERATOR "TBZ2")
+ SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" )
+ INCLUDE(CPack)
+
+ SET(PACKAGE ${RPMNAME})
+ SPECFILE()
+
+ ADD_CUSTOM_TARGET( svncheck
+ COMMAND cd $(CMAKE_SOURCE_DIR) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision'
+ )
+
+ SET( AUTOBUILD_COMMAND
+ COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/package/*.tar.bz2
+ COMMAND ${CMAKE_MAKE_PROGRAM} package_source
+ COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package
+ COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes" "${CMAKE_BINARY_DIR}/package/${PACKAGE}.changes"
+ )
+
+ ADD_CUSTOM_TARGET( srcpackage_local
+ ${AUTOBUILD_COMMAND}
+ )
+
+ ADD_CUSTOM_TARGET( srcpackage
+ COMMAND ${CMAKE_MAKE_PROGRAM} svncheck
+ ${AUTOBUILD_COMMAND}
+ )
+ENDMACRO(GENERATE_PACKAGING)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.4/devtools/cmake/TODO new/yast2-devtools-2.16.5/devtools/cmake/TODO
--- old/yast2-devtools-2.16.4/devtools/cmake/TODO 2008-01-31 14:05:17.000000000 +0100
+++ new/yast2-devtools-2.16.5/devtools/cmake/TODO 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-- when doing "make srcpackage", create package/ subdir if it doesn't exist
- (the tarball will become a file named "package" then and copying the .changes
- file to package/ will fail)
-
-- make sure to recreate the .spec file upon "make srcpackage"
- (.spec.in might have changed since the last "cmake" call)
-
-- make sure to use the latest VERSION file upon "make srcpackage"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.4/devtools/doc/skeletons/config/index.html new/yast2-devtools-2.16.5/devtools/doc/skeletons/config/index.html
--- old/yast2-devtools-2.16.4/devtools/doc/skeletons/config/index.html 2008-02-01 17:20:03.000000000 +0100
+++ new/yast2-devtools-2.16.5/devtools/doc/skeletons/config/index.html 2008-02-08 16:11:26.000000000 +0100
@@ -124,10 +124,10 @@
</tr>
<tr>
<td>
- <a href="complex.html#Modified">Modified ()</a>
+ <a href="XXPkgXX.html#Modified">Modified ()</a>
</td>
<td>
- <a href="complex.html">complex.ycp</a>
+ <a href="XXPkgXX.html">XXPkgXX.ycp</a>
</td>
</tr>
<tr>
@@ -140,10 +140,10 @@
</tr>
<tr>
<td>
- <a href="XXPkgXX.html#Modified">Modified ()</a>
+ <a href="complex.html#Modified">Modified ()</a>
</td>
<td>
- <a href="XXPkgXX.html">XXPkgXX.ycp</a>
+ <a href="complex.html">complex.ycp</a>
</td>
</tr>
<tr>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.4/Makefile.am new/yast2-devtools-2.16.5/Makefile.am
--- old/yast2-devtools-2.16.4/Makefile.am 2008-02-01 17:13:40.000000000 +0100
+++ new/yast2-devtools-2.16.5/Makefile.am 2007-12-02 21:37:03.000000000 +0100
@@ -214,4 +214,4 @@
test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = devtools docbook doxygen scrdoc yast2 ycpdoc ydoc y2logview
+SUBDIRS = devtools docbook doxygen scrdoc y2logview yast2 ycpdoc ydoc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.4/Makefile.in new/yast2-devtools-2.16.5/Makefile.in
--- old/yast2-devtools-2.16.4/Makefile.in 2008-02-01 17:13:57.000000000 +0100
+++ new/yast2-devtools-2.16.5/Makefile.in 2007-12-02 21:37:14.000000000 +0100
@@ -279,7 +279,7 @@
TAGVERSION = $(Y2TOOL) tagversion
# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = devtools docbook doxygen scrdoc yast2 ycpdoc ydoc y2logview
+SUBDIRS = devtools docbook doxygen scrdoc y2logview yast2 ycpdoc ydoc
all: all-recursive
.SUFFIXES:
@@ -551,6 +551,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -577,6 +581,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -734,20 +740,20 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-libtool distclean-tags \
- distcleancheck distdir distuninstallcheck 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-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pkgconfigDATA install-pkgconfigdataDATA \
- install-ps install-ps-am install-strip 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-pkgconfigDATA \
- uninstall-pkgconfigdataDATA
+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+ distcheck distclean distclean-generic distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck 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-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgconfigDATA \
+ install-pkgconfigdataDATA install-ps install-ps-am \
+ install-strip 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-pkgconfigDATA uninstall-pkgconfigdataDATA
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.4/VERSION new/yast2-devtools-2.16.5/VERSION
--- old/yast2-devtools-2.16.4/VERSION 2008-02-01 17:12:39.000000000 +0100
+++ new/yast2-devtools-2.16.5/VERSION 2008-02-08 16:10:17.000000000 +0100
@@ -1 +1 @@
-2.16.4
+2.16.5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.16.4/yast2/ycp-mode.el new/yast2-devtools-2.16.5/yast2/ycp-mode.el
--- old/yast2-devtools-2.16.4/yast2/ycp-mode.el 2007-01-30 10:16:51.000000000 +0100
+++ new/yast2-devtools-2.16.5/yast2/ycp-mode.el 2008-02-08 13:04:39.000000000 +0100
@@ -60,7 +60,7 @@
(ycp-builtin-funcs
(eval-when-compile
(regexp-opt '("is" "select" "lookup" "contains" "setcontains"
- "size" "haskey" "add" "prepend" "union" "foreach" "filter"
+ "size" "haskey" "add" "prepend" "union" "merge" "foreach" "filter"
"find" "maplist" "flatten" "sort" "time" "toset" "listmap" "mapmap"
"tointeger" "tofloat" "tostring" "topath"
"crypt" "substring" "findfirstnotof" "tolower"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org