commit yast2-devtools for openSUSE:Factory

24 Nov 2014

Hello community,

here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2014-11-24 11:11:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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	2014-10-11 19:25:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes	2014-11-24 11:11:15.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Nov 13 11:46:32 UTC 2014 - jreidinger@suse.com
+
+- fix building with new libtool which use variable in backticks
+  causing double backticks and failure to build
+- 3.1.26
+
+-------------------------------------------------------------------

Old:
----
  yast2-devtools-3.1.25.tar.bz2

New:
----
  yast2-devtools-3.1.26.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-devtools.spec ++++++
--- /var/tmp/diff_new_pack.NHLm5P/_old	2014-11-24 11:11:16.000000000 +0100
+++ /var/tmp/diff_new_pack.NHLm5P/_new	2014-11-24 11:11:16.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-devtools
-Version:        3.1.25
+Version:        3.1.26
 Release:        0
 Url:            http://github.com/yast/yast-devtools
 

++++++ yast2-devtools-3.1.25.tar.bz2 -> yast2-devtools-3.1.26.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.25/README.md new/yast2-devtools-3.1.26/README.md
--- old/yast2-devtools-3.1.25/README.md	2014-10-08 14:48:11.000000000 +0200
+++ new/yast2-devtools-3.1.26/README.md	2014-11-14 11:18:12.000000000 +0100
@@ -1,6 +1,7 @@
 ## Yast Development Tools
 
-[![Build Status](https://travis-ci.org/yast/yast-devtools.png?branch=master)](https://travis-ci.org/yast/yast-devtools)
+Travis: [![Build Status](https://travis-ci.org/yast/yast-devtools.png?branch=master)](https://travis-ci.org/yast/yast-devtools)
+Jenkins: [![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-devtools-master.svg)](https://ci.opensuse.org/view/Yast/job/yast-devtools-master/)
 
 
 ## Directory Structure
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.25/build-tools/Makefile.am.toplevel new/yast2-devtools-3.1.26/build-tools/Makefile.am.toplevel
--- old/yast2-devtools-3.1.25/build-tools/Makefile.am.toplevel	2014-10-08 14:48:11.000000000 +0200
+++ new/yast2-devtools-3.1.26/build-tools/Makefile.am.toplevel	2014-11-14 11:18:12.000000000 +0100
@@ -27,14 +27,14 @@
 # where devtools install m4 snippets
 # argh, executed literally
 #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I $(if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi)/aclocal
 
 Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common
 	cmp -s $< $@ || cp -f $< $@
 
 # create bzip2ed tar and make some sanity checks
 $(RPMNAME)-$(VERSION).tar.bz2: checkpo dist-bzip2
-	@if [ `bunzip2 -c $(RPMNAME)-$(VERSION).tar.bz2 | wc --bytes` = 0 ] ; then \
+	@if [ $(bunzip2 -c $(RPMNAME)-$(VERSION).tar.bz2 | wc --bytes) = 0 ] ; then \
 	    echo "Error: created tar is empty" ; \
 	    exit 1 ; \
 	fi
@@ -76,8 +76,8 @@
 	$(Y2TOOL) y2makepot -s $(srcdir)
 
 install-pot: pot
-	@POT_DST=`find -type d -name testsuite -prune , \
-		-type f -name "*.pot"` ; \
+	@POT_DST=$(find -type d -name testsuite -prune , \
+		-type f -name "*.pot") ; \
 	if [ -n "$$POT_DST" ] ; then \
 	    echo "mkdir -p $(DESTDIR)$(potdir)" ; \
 	    mkdir -p $(DESTDIR)$(potdir) ; \
@@ -109,10 +109,10 @@
 	    echo "You have to install yast2-devtools to making a package"; \
 	    false; \
 	fi
-	here=`pwd`; \
+	here=$(pwd); \
 	cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
 	    if [ -f "$$i" ]; then \
-		newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
+		newname="$(echo "$$i" | sed "s/\.in$$//g")"; \
 		$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
 	    fi \
 	done
@@ -123,7 +123,7 @@
 
 # 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 \
+	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
 
@@ -132,7 +132,7 @@
 	[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
 
 check-parse-old:
-	@if [ `find -type f -name "*.ycp" | wc -l` -gt 0 -a "$(RPMNAME)" != "yast2-core" ] ; then \
+	@if [ $(find -type f -name "*.ycp" | wc -l) -gt 0 -a "$(RPMNAME)" != "yast2-core" ] ; then \
 		echo "Running parseycp..." ; \
 		parseycp -q -R ; \
 	else \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.25/build-tools/scripts/y2makepot new/yast2-devtools-3.1.26/build-tools/scripts/y2makepot
--- old/yast2-devtools-3.1.25/build-tools/scripts/y2makepot	2014-10-08 14:48:11.000000000 +0200
+++ new/yast2-devtools-3.1.26/build-tools/scripts/y2makepot	2014-11-14 11:18:12.000000000 +0100
@@ -76,8 +76,10 @@
     if [ -n "$FILES" ]; then
         echo "Creating ./$MODULE.pot from $FILES ...";
 
+        RXGETTEXT_PATH=`which $RXGETTEXT`
+
         # rubygem-gettext is a weak dependency, check if it is present
-        if [ -x $RXGETTEXT ]; then
+        if [ -x "$RXGETTEXT_PATH" ]; then
             $RXGETTEXT --copyright-holder="SuSE Linux Products GmbH, Nuernberg" \
                 --add-comments --output=$MODULE.pot $FILES;
 
@@ -224,7 +226,7 @@
 # define global variables
 CHECKIN=1
 XGETTEXT="xgettext"
-RXGETTEXT=/usr/bin/rxgettext
+RXGETTEXT="rxgettext"
 
 SRCDIR="."
 POT_DST=""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.25/package/yast2-devtools.changes new/yast2-devtools-3.1.26/package/yast2-devtools.changes
--- old/yast2-devtools-3.1.25/package/yast2-devtools.changes	2014-10-08 14:48:11.000000000 +0200
+++ new/yast2-devtools-3.1.26/package/yast2-devtools.changes	2014-11-14 11:18:12.000000000 +0100
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu Nov 13 11:46:32 UTC 2014 - jreidinger@suse.com
+
+- fix building with new libtool which use variable in backticks
+  causing double backticks and failure to build
+- 3.1.26
+
+-------------------------------------------------------------------
 Tue Sep 23 09:25:35 UTC 2014 - jreidinger@suse.com
 
 - Do not read (and have ./configure evaluate) the MAINTAINER file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.25/package/yast2-devtools.spec new/yast2-devtools-3.1.26/package/yast2-devtools.spec
--- old/yast2-devtools-3.1.25/package/yast2-devtools.spec	2014-10-08 14:48:11.000000000 +0200
+++ new/yast2-devtools-3.1.26/package/yast2-devtools.spec	2014-11-14 11:18:12.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-devtools
-Version:        3.1.25
+Version:        3.1.26
 Release:        0
 Url:            http://github.com/yast/yast-devtools
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.25/travis-tools/README.md new/yast2-devtools-3.1.26/travis-tools/README.md
--- old/yast2-devtools-3.1.25/travis-tools/README.md	1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-devtools-3.1.26/travis-tools/README.md	2014-11-14 11:18:12.000000000 +0100
@@ -0,0 +1,15 @@
+## Travis tools
+
+Travis tools are designed to share [Travis CI](https://travis-ci.org)
+scripts.
+
+These scripts are not needed at RPM package build, they can be used from
+`.travis.yml` file.
+
+
+## Travis Documentation
+
+- [General Travis documentation](http://docs.travis-ci.com/user/getting-started/)
+- [Installing extra packages](http://docs.travis-ci.com/user/installing-dependencies/)
+- [Customizing build](http://docs.travis-ci.com/user/customizing-the-build/)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.25/travis-tools/travis_setup.sh new/yast2-devtools-3.1.26/travis-tools/travis_setup.sh
--- old/yast2-devtools-3.1.25/travis-tools/travis_setup.sh	1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-devtools-3.1.26/travis-tools/travis_setup.sh	2014-11-14 11:18:12.000000000 +0100
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# Prepare a Travis node for running Yast build:
+#
+# - import YaST:Head:Travis OBS repository GPG key
+# - add YaST:Head:Travis OBS repository
+# - download/refresh repository metadata
+# - optionally install specified packages
+# - optionally install specified Ruby gems (from rubygems.org)
+#   (Very likely you will need to switch to system Ruby using
+#    "rvm reset" *before* installing gems with this script.)
+#
+
+set -x
+
+# Remove extra repositories to avoid unnecessary downloads at repo refresh,
+# we do not need the latest postgres, mysql, couchdb, rabbitmq, ...
+# The standard Ubuntu repos in /etc/apt/sources.list are kept.
+sudo rm /etc/apt/sources.list.d/*
+
+# prepare the system for installing additional packages from OBS
+curl http://download.opensuse.org/repositories/YaST:/Head:/Travis/xUbuntu_12.04/R... | sudo apt-key add -
+echo "deb http://download.opensuse.org/repositories/YaST:/Head:/Travis/xUbuntu_12.04/ ./" | sudo tee -a /etc/apt/sources.list
+
+sudo apt-get update -q
+
+while getopts ":p:g:" opt; do
+  case $opt in
+    # install packages
+    p)
+      sudo apt-get install --no-install-recommends $OPTARG
+      ;;
+    # install Ruby gems
+    g)
+      sudo gem install $OPTARG
+      ;;
+    \?)
+      echo "Invalid option: -$OPTARG" >&2
+      exit 1
+      ;;
+  esac
+done
+

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)