Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2013-12-17 07:31:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-13 13:12:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes 2013-12-17 07:31:33.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Dec 16 08:51:24 UTC 2013 - [email protected] + +- use the first "Version" tag from spec when looking for the + package version, fixes problem when multiple tags are present +- 3.1.13 + +------------------------------------------------------------------- +Fri Dec 13 10:36:59 UTC 2013 - [email protected] + +- Fix QEMU-ARM build by adding + %{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK file in file list + when built in qemu since no make check are done in this case + +------------------------------------------------------------------- Old: ---- yast2-devtools-3.1.12.tar.bz2 New: ---- yast2-devtools-3.1.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.3D7MPe/_old 2013-12-17 07:31:34.000000000 +0100 +++ /var/tmp/diff_new_pack.3D7MPe/_new 2013-12-17 07:31:34.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.12 +Version: 3.1.13 Release: 0 Url: http://github.com/yast/yast-devtools @@ -155,6 +155,9 @@ %dir %{_datadir}/YaST2/data/devtools/bin %{_datadir}/YaST2/data/devtools/admin %{_datadir}/YaST2/data/devtools/Doxyfile +%if 0%{?qemu_user_space_build} +%{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK +%endif # needed for doxygen, not nice %{_datadir}/YaST2/data/devtools/footer-notimestamp.html %{_datadir}/YaST2/data/devtools/data ++++++ yast2-devtools-3.1.12.tar.bz2 -> yast2-devtools-3.1.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.12/build-tools/Makefile.am.toplevel new/yast2-devtools-3.1.13/build-tools/Makefile.am.toplevel --- old/yast2-devtools-3.1.12/build-tools/Makefile.am.toplevel 2013-12-13 09:58:52.000000000 +0100 +++ new/yast2-devtools-3.1.13/build-tools/Makefile.am.toplevel 2013-12-16 13:49:01.000000000 +0100 @@ -10,7 +10,7 @@ Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool RPMNAME = $(shell cat $(srcdir)/RPMNAME) -VERSION = $(shell grep '^[[:space:]]*Version:' $(srcdir)/package/$(RPMNAME).spec | sed -e 's/Version:[[:space:]]*\([[:print:]]\+\)/\1/') +VERSION = $(shell grep -m 1 '^[[:space:]]*Version:' $(srcdir)/package/$(RPMNAME).spec | sed -e 's/Version:[[:space:]]*\([[:print:]]\+\)/\1/') SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.12/build-tools/cmake/modules/YastCommon.cmake new/yast2-devtools-3.1.13/build-tools/cmake/modules/YastCommon.cmake --- old/yast2-devtools-3.1.12/build-tools/cmake/modules/YastCommon.cmake 2013-12-13 09:58:52.000000000 +0100 +++ new/yast2-devtools-3.1.13/build-tools/cmake/modules/YastCommon.cmake 2013-12-16 13:49:01.000000000 +0100 @@ -51,7 +51,7 @@ MESSAGE(STATUS "package name set to '${RPMNAME}'") file (GLOB spec_files "package/*.spec") -execute_process(COMMAND "grep" "^[[:space:]]*Version:" ${spec_files} +execute_process(COMMAND "grep" "-m" "1" "^[[:space:]]*Version:" ${spec_files} COMMAND "sed" "-e" "s/Version:[[:space:]]*\\([[:print:]]\\+\\)/\\1/" OUTPUT_VARIABLE VERSION) message(STATUS "Version: ${VERSION}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.12/build-tools/scripts/y2autoconf new/yast2-devtools-3.1.13/build-tools/scripts/y2autoconf --- old/yast2-devtools-3.1.12/build-tools/scripts/y2autoconf 2013-12-13 09:58:52.000000000 +0100 +++ new/yast2-devtools-3.1.13/build-tools/scripts/y2autoconf 2013-12-16 13:49:01.000000000 +0100 @@ -39,7 +39,7 @@ $RPMNAME = `cat RPMNAME`; chomp $RPMNAME; -$VERSION = `grep '^[[:space:]]*Version:' package/$RPMNAME.spec | sed -e 's/Version:[[:space:]]*\\([[:print:]]\\+\\)/\\1/'`; +$VERSION = `grep -m 1 '^[[:space:]]*Version:' package/$RPMNAME.spec | sed -e 's/Version:[[:space:]]*\\([[:print:]]\\+\\)/\\1/'`; chomp $VERSION; $MAINTAINER = `cat MAINTAINER`; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.12/package/yast2-devtools.changes new/yast2-devtools-3.1.13/package/yast2-devtools.changes --- old/yast2-devtools-3.1.12/package/yast2-devtools.changes 2013-12-13 09:58:52.000000000 +0100 +++ new/yast2-devtools-3.1.13/package/yast2-devtools.changes 2013-12-16 13:49:01.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Dec 16 08:51:24 UTC 2013 - [email protected] + +- use the first "Version" tag from spec when looking for the + package version, fixes problem when multiple tags are present +- 3.1.13 + +------------------------------------------------------------------- +Fri Dec 13 10:36:59 UTC 2013 - [email protected] + +- Fix QEMU-ARM build by adding + %{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK file in file list + when built in qemu since no make check are done in this case + +------------------------------------------------------------------- Wed Dec 11 18:16:18 UTC 2013 - [email protected] - y2autoconf - in perl we need extra backslash escaping diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.12/package/yast2-devtools.spec new/yast2-devtools-3.1.13/package/yast2-devtools.spec --- old/yast2-devtools-3.1.12/package/yast2-devtools.spec 2013-12-13 09:58:52.000000000 +0100 +++ new/yast2-devtools-3.1.13/package/yast2-devtools.spec 2013-12-16 13:49:01.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.12 +Version: 3.1.13 Release: 0 Url: http://github.com/yast/yast-devtools @@ -156,6 +156,9 @@ %dir %{_datadir}/YaST2/data/devtools/bin %{_datadir}/YaST2/data/devtools/admin %{_datadir}/YaST2/data/devtools/Doxyfile +%if 0%{?qemu_user_space_build} +%{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK +%endif # needed for doxygen, not nice %{_datadir}/YaST2/data/devtools/footer-notimestamp.html %{_datadir}/YaST2/data/devtools/data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.12/ytools/y2tool/tagversion new/yast2-devtools-3.1.13/ytools/y2tool/tagversion --- old/yast2-devtools-3.1.12/ytools/y2tool/tagversion 2013-12-13 09:58:52.000000000 +0100 +++ new/yast2-devtools-3.1.13/ytools/y2tool/tagversion 2013-12-16 13:49:01.000000000 +0100 @@ -30,7 +30,7 @@ done p=`cat RPMNAME` -v=`grep '^[[:space:]]*Version:' package/$p.spec | sed -e 's/Version:[[:space:]]*\([[:print:]]\+\)/\1/' | tr "." "_"` +v=`grep -m 1 '^[[:space:]]*Version:' package/$p.spec | sed -e 's/Version:[[:space:]]*\([[:print:]]\+\)/\1/' | tr "." "_"` if [ -z "$p" -o -z "$v" ]; then echo "Cannot find RPMNAME or Version value in package/$p.spec in `pwd`" exit 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
