From 63c3da9c22bda56977f33e9e06c9756312942d616139eb95028af0acbc2fc806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 4 Jan 2013 12:52:04 +0000 Subject: [PATCH 1/2] Accepting request 146894 from home:steffens:branch:openSUSE:Tools added support for dpkg tar file naming (${NAME}_${VERSION}.orig.tar.gz) OBS-URL: https://build.opensuse.org/request/show/146894 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=10 --- obs-service-set_version.spec | 2 +- set_version | 12 ++++++++---- set_version.service | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index daebd23..91eb27f 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-set_version # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 diff --git a/set_version b/set_version index 3001fb8..d090c6f 100644 --- a/set_version +++ b/set_version @@ -45,21 +45,25 @@ done get_version_from_file () { if [ -z "$MYVERSION" ]; then - MYVERSION=`ls -1t | sed -n "s,$BASENAME.*-\([0123456789].*\).tar.*,\1,p" | head -n 1` + 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` + 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` + 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` + MYVERSION=`ls -1t | sed -n "s,$BASENAME.*[-_]\([0123456789].*\).zip$,\1,p" | head -n 1` 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` + echo "Detected version as $MYVERSION" } diff --git a/set_version.service b/set_version.service index 7da12a4..74c50bc 100644 --- a/set_version.service +++ b/set_version.service @@ -1,5 +1,5 @@ - Updates version in spec file + Updates version in spec and dsc files This service updates a spec file according to the existing files. Can be used after download_url or tar_scm service. From 4bd1ba3bd1e0cf24de10147e9caeecdf5779284925b1958440fa62766f303614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 13 May 2013 12:22:59 +0000 Subject: [PATCH 2/2] osc copypac from project:OBS:Server:2.4 package:obs-service-set_version revision:25, using keep-link OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=11 --- obs-service-set_version.changes | 5 +++++ set_version | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index 4302866..89eb7ac 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 16 09:30:01 UTC 2013 - adrian@suse.de + +- add support for PKGBUILD aka Arch Linux files + ------------------------------------------------------------------- Tue Jun 26 15:01:27 UTC 2012 - saschpe@suse.de diff --git a/set_version b/set_version index d090c6f..453e4b9 100644 --- a/set_version +++ b/set_version @@ -93,6 +93,16 @@ write_files () { 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