From 509414b1e1a2792a27d426c9c2a2ee7ce3f1ffbdef7c89acf57535d00ee1b40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian.schroeter@suse.com>
Date: Mon, 27 Jul 2015 08:23:56 +0000
Subject: [PATCH] Accepting request 318409 from
 home:hiberis:branches:openSUSE:Tools

OBS-URL: https://build.opensuse.org/request/show/318409
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=41
---
 PKGBUILD                                                 | 2 +-
 _service                                                 | 2 +-
 debian.dsc                                               | 2 +-
 obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz | 3 +++
 obs-service-set_version-0.5.0.tar.gz                     | 3 ---
 obs-service-set_version.changes                          | 6 ++++++
 obs-service-set_version.spec                             | 7 +++----
 7 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz
 delete mode 100644 obs-service-set_version-0.5.0.tar.gz

diff --git a/PKGBUILD b/PKGBUILD
index 4af5195..8416db1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
 asd=yxc
 pkgrel=0
-md5sums=('801b31dd37c1db8fd7164e4c91dc0eaf')
+md5sums=('6c56205dc76539e518f940aebd7eaafb')
 
diff --git a/_service b/_service
index 83d978d..82074d5 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="version">git-master</param>
-    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="versionformat">@PARENT_TAG@+git%cd.%h</param>
     <param name="revision">master</param>
     <param name="changesgenerate">enable</param>
   </service>
diff --git a/debian.dsc b/debian.dsc
index 8df3d94..c77accc 100644
--- a/debian.dsc
+++ b/debian.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: obs-service-set-version
-Version: 0.5.0
+Version: 0.5.0+git20150724.7ee0a9a
 Binary: obs-service-set-version
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
diff --git a/obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz b/obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz
new file mode 100644
index 0000000..9dafa47
--- /dev/null
+++ b/obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6672a703705d1c0fa8f8aa2bc88f9c6ec67216b30af2372945023a8bdc82c237
+size 11667
diff --git a/obs-service-set_version-0.5.0.tar.gz b/obs-service-set_version-0.5.0.tar.gz
deleted file mode 100644
index 03e2c6f..0000000
--- a/obs-service-set_version-0.5.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ff5ed084613235c85ad89d9c34a5a1be0da0a6e463ad29f16c3ff9fc5cd17af
-size 11456
diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes
index f18c375..3e054d2 100644
--- a/obs-service-set_version.changes
+++ b/obs-service-set_version.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 24 09:26:53 UTC 2015 - hib@hiberis.nl
+
+- Use install target from Makefile
+- Include git revision in version number
+
 -------------------------------------------------------------------
 Fri Jul 24 08:12:15 UTC 2015 - tbechtold@suse.com
 
diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec
index 7138445..e8c0d47 100644
--- a/obs-service-set_version.spec
+++ b/obs-service-set_version.spec
@@ -19,13 +19,14 @@
 %define service set_version
 
 Name:           obs-service-%{service}
-Version:        0.5.0
+Version:        0.5.0+git20150724.7ee0a9a
 Release:        0
 Summary:        An OBS source service: Update spec file version
 License:        GPL-2.0+
 Group:          Development/Tools/Building
 Url:            https://github.com/openSUSE/obs-service-%{service}
 Source:         %{name}-%{version}.tar.gz
+Requires:       python-packaging
 Requires:       sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
@@ -42,9 +43,7 @@ a given version or to the existing files.
 %build
 
 %install
-mkdir -p %{buildroot}%{_prefix}/lib/obs/service
-install -m 0755 set_version %{buildroot}%{_prefix}/lib/obs/service
-install -m 0644 set_version.service %{buildroot}%{_prefix}/lib/obs/service
+%makeinstall
 
 %files
 %defattr(-,root,root)