Hello community,
here is the log from the commit of package obs-service-set_version for
openSUSE:Factory checked in at 2014-02-11 11:03:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2013-10-30 15:47:49.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-set_version.new/obs-service-set_version.changes
2014-02-11 11:03:28.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Feb 10 09:53:00 UTC 2014 - [email protected]
+
+- Update to version 0.3.1:
+ + Check tarball content's root-dir for version
+ + Use a for-loop for different endings
+
+-------------------------------------------------------------------
Old:
----
obs-service-set_version-0.3.tar.gz
New:
----
_servicedata
obs-service-set_version-0.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-set_version.spec ++++++
--- /var/tmp/diff_new_pack.Kc0eHq/_old 2014-02-11 11:03:28.000000000 +0100
+++ /var/tmp/diff_new_pack.Kc0eHq/_new 2014-02-11 11:03:28.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-set_version
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define service set_version
Name: obs-service-%{service}
-Version: 0.3
+Version: 0.3.1
Release: 0
Summary: An OBS source service: Update spec file version
License: GPL-2.0+
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Kc0eHq/_old 2014-02-11 11:03:28.000000000 +0100
+++ /var/tmp/diff_new_pack.Kc0eHq/_new 2014-02-11 11:03:28.000000000 +0100
@@ -6,7 +6,7 @@
<param name="version">git-master</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="revision">master</param>
- <param
name="changesrevision">faa5a4fd7a531eeab0ab43bbe1c5ccc909b607dd</param>
+ <param name="changesgenerate">enable</param>
</service>
<service mode="disabled" name="recompress">
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param
name="url">[email protected]:openSUSE/obs-service-set_version.git</param>
<param name="changesrevision">79883d84e2</param>
</service>
</servicedata>
++++++ obs-service-set_version-0.3.tar.gz ->
obs-service-set_version-0.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.3/set_version
new/obs-service-set_version-0.3.1/set_version
--- old/obs-service-set_version-0.3/set_version 2013-10-29 14:38:27.000000000
+0100
+++ new/obs-service-set_version-0.3.1/set_version 2014-02-10
10:52:59.000000000 +0100
@@ -27,7 +27,7 @@
shift
;;
*-basename)
- BASENAME="^$2"
+ BASENAME="$2"
shift
;;
*-outdir)
@@ -44,20 +44,24 @@
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.*[-_]\([0123456789].*\),\1,p"`
+ else
+ break;
+ fi
+ done
+ # Take version number (and optional revision) from Debian changelog
if [ -z "$MYVERSION" ]; then
- MYVERSION=`ls -1t | sed -n
"s,$BASENAME.*[-_]\([0123456789].*\).tar.*,\1,p" | head -n 1`
- fi
- if [ -z "$MYVERSION" ]; then
- MYVERSION=`ls -1t | sed -n "s,$BASENAME.*[-_]\([0123456789].*\).tgz$,\1,p"
| head -n 1`
- fi
- if [ -z "$MYVERSION" ]; then
- MYVERSION=`ls -1t | sed -n
"s,$BASENAME.*[-_]\([0123456789].*\).tbz2$,\1,p" | head -n 1`
- fi
- if [ -z "$MYVERSION" ]; then
- MYVERSION=`ls -1t | sed -n "s,$BASENAME.*[-_]\([0123456789].*\).zip$,\1,p"
| head -n 1`
- fi
- if [ -z "$MYVERSION" ]; then
- # take version number (and optional revision) from Debian changelog
MYVERSION=`head -n 1 *debian.changelog 2>/dev/null | sed -ne
's/.*(\(.*\)).*/\1/p'`
fi
if [ -z "$MYVERSION" ]; then
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
