Hello community,
here is the log from the commit of package obs-service-set_version for
openSUSE:Factory checked in at 2014-03-18 13:55:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-set_version (Old)
and /work/SRC/openSUSE:Factory/.obs-service-set_version.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-set_version"
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-set_version/obs-service-set_version.changes
2014-03-14 15:17:24.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-set_version.new/obs-service-set_version.changes
2014-03-18 13:55:50.000000000 +0100
@@ -1,0 +2,21 @@
+Mon Mar 17 09:52:56 UTC 2014 - adr...@suse.de
+
+- Update to version 0.4.1:
+ + - drop old bash version
+ + - fix PKGBUILD version setting
+ + fix help text
+ + support detection from tar ball content
+ + use warnings pragma
+ + - replace bash script with a more secure perl version
+ + fix urgent quoting bugs
+ + Be more liberal in root-dir version detection
+
+-------------------------------------------------------------------
+Mon Mar 17 09:51:15 UTC 2014 - adr...@suse.de
+
+- Update to version 0.4.1:
+ + - drop old bash version
+ + - fix PKGBUILD version setting
+ + fix help text
+
+-------------------------------------------------------------------
Old:
----
obs-service-set_version-0.4.0.tar.gz
New:
----
obs-service-set_version-0.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-set_version.spec ++++++
--- /var/tmp/diff_new_pack.v7YQNV/_old 2014-03-18 13:55:52.000000000 +0100
+++ /var/tmp/diff_new_pack.v7YQNV/_new 2014-03-18 13:55:52.000000000 +0100
@@ -19,7 +19,7 @@
%define service set_version
Name: obs-service-%{service}
-Version: 0.4.0
+Version: 0.4.1
Release: 0
Summary: An OBS source service: Update spec file version
License: GPL-2.0+
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.v7YQNV/_old 2014-03-18 13:55:52.000000000 +0100
+++ /var/tmp/diff_new_pack.v7YQNV/_new 2014-03-18 13:55:52.000000000 +0100
@@ -1,4 +1,4 @@
asd=yxc
pkgrel=0
-md5sums=('70c8c0d33e2d47fcb7ad658a231d9f8c')
+md5sums=('c62a9acf229820070c178fab5d14cfee')
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.v7YQNV/_old 2014-03-18 13:55:52.000000000 +0100
+++ /var/tmp/diff_new_pack.v7YQNV/_new 2014-03-18 13:55:52.000000000 +0100
@@ -1,6 +1,5 @@
<servicedata>
<service name="tar_scm">
<param
name="url">g...@github.com:openSUSE/obs-service-set_version.git</param>
- <param name="changesrevision">48ed90f863</param>
- </service>
+ <param name="changesrevision">8c7f0634e6</param></service>
</servicedata>
\ No newline at end of file
++++++ obs-service-set_version-0.4.0.tar.gz ->
obs-service-set_version-0.4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.4.0/set_version
new/obs-service-set_version-0.4.1/set_version
--- old/obs-service-set_version-0.4.0/set_version 2014-03-07
13:06:40.000000000 +0100
+++ new/obs-service-set_version-0.4.1/set_version 2014-03-17
10:51:14.000000000 +0100
@@ -33,7 +33,7 @@
Required:
- --output: mediaset, build only for the given mediaset, identify by name
+ --outdir: out put directory for modified sources
Options:
@@ -184,6 +184,7 @@
close(FILE);
die ("Failed to calculate md5sum") unless $md5sum;
+ replace_tag("PKGBUILD", "pkgver", $version);
replace_tag("PKGBUILD", "pkgrel", "0");
replace_tag("PKGBUILD", "md5sums", "('".$md5sum."')");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-set_version-0.4.0/set_version.old.do_not_use
new/obs-service-set_version-0.4.1/set_version.old.do_not_use
--- old/obs-service-set_version-0.4.0/set_version.old.do_not_use
2014-03-07 13:06:40.000000000 +0100
+++ new/obs-service-set_version-0.4.1/set_version.old.do_not_use
1970-01-01 01:00:00.000000000 +0100
@@ -1,116 +0,0 @@
-#!/bin/bash
-
-# A simple script to update spec or dsc file
-# very, very simple. I am happy about patches which handles multiple files
with different version numbers
-#
-# (C) 2010 by Adrian Schröter <adr...@suse.de>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# See http://www.gnu.org/licenses/gpl-2.0.html for full license text.
-
-
-# defaults
-MYVERSION=""
-FILES=""
-
-while test $# -gt 0; do
- case $1 in
- *-version)
- MYVERSION="$2"
- shift
- ;;
- *-file)
- FILES="$FILES ${2##*/}"
- shift
- ;;
- *-basename)
- BASENAME="$2"
- shift
- ;;
- *-outdir)
- MYOUTDIR="$2"
- shift
- ;;
- *)
- echo Unknown parameter $1.
- echo 'Usage: set_version --version $VERSION --file $FILE --basename
$BASENAME --outdir $OUT'
- exit 1
- ;;
- esac
- shift
-done
-
-get_version_from_file () {
- # Search for tarball filenames including a version
- for ending in "tar.*" "tgz$" "tbz2$" "zip$" ; do
- if [ -z "$MYVERSION" ]; then
- MYVERSION=`ls -1t | sed -n
"s,^$BASENAME.*[-_]\([0123456789].*\).${ending},\1,p" | head -n 1`
- else
- break;
- fi
- done
- # Search for a version in the root-directory name of the content's file list:
- for gz_ending in "tar.gz" "tgz" "tar.bz2" "tbz2" ; do
- if [ -z "$MYVERSION" ]; then
- MYVERSION=`tar tf $BASENAME*.${gz_ending} | sed -e 's,/.*,,' | uniq |
sed -n "s,$BASENAME.*[-_]\(.*\),\1,p"`
- else
- break;
- fi
- done
- # Take version number (and optional revision) from Debian changelog
- if [ -z "$MYVERSION" ]; then
- MYVERSION=`head -n 1 *debian.changelog 2>/dev/null | sed -ne
's/.*(\(.*\)).*/\1/p'`
- fi
- if [ -z "$MYVERSION" ]; then
- echo "ERROR: no version is given and can't get detected automatically"
- exit 1
- fi
-
- # remove trailing ".orig", used by dpkg sources
- MYVERSION=`sed s/.orig$// <<<"$MYVERSION"`
-}
-
-write_files () {
- if [ -z "$FILES" ]; then
- FILES="*.spec *.dsc"
- fi
- if [ -z "$MYOUTDIR" ]; then
- echo "ERROR: no output directory is given via --outdir parameter!"
- exit 1
- fi
-
- for i in $FILES; do
- FILE=`ls -1 $i 2>/dev/null`
- [ -e "$FILE" ] || continue
-
- sed "0,/^Version:\(\s*\)[^%]*/s//Version:\1$MYVERSION/" "$FILE" >
"$MYOUTDIR/$FILE" || exit 1
- if [ "${FILE%.spec}" != "$FILE" ]; then
- # set release back to zero after version upgrade, will be increased by
OBS during build
- # also keep macros in release in case of fedora/mandriva
- sed -r -i "s,^Release:(\s*)[^%]*,Release:\10," "$MYOUTDIR/$FILE" || exit
1
- fi
-
- if [ "${FILE#_service:}" != "$FILE" ]; then
- # we can remove service files, no need to store them twice
- rm -f "$FILE"
- fi
- done
-
- if [ -e PKGBUILD ]; then
- FILE=`ls -1 _service:*[-_]"${MYVERSION}"* | head -n 1`
- [ -z "$FILE" ] && FILE=`ls -1 *[-_]"${MYVERSION}"* | head -n 1`
- MD5=`md5sum "$FILE" | head -n 1 | cut -d\ -f 1`
-
- sed "0,/^pkgver=\(\s*\)[^%]*/s//pkgver=\1$MYVERSION/" PKGBUILD >
"$MYOUTDIR/PKGBUILD" || exit 1
- sed -r -i "s,^pkgrel=.*,pkgrel=0," "$MYOUTDIR/PKGBUILD" || exit 1
- sed -r -i "s,^md5sums=.*,md5sums=('$MD5')," "$MYOUTDIR/PKGBUILD" || exit 1
- fi
-}
-
-get_version_from_file
-write_files
-
-exit 0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
