Accepting request 396942 from openSUSE:Tools

1

OBS-URL: https://build.opensuse.org/request/show/396942
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-tar_scm?expand=0&rev=29

0001-Debianization-disable-running-mercurial-tests.patch

@@ -0,0 +1,45 @@
+From c2c2e7bbaea6d224ad5742f47fb4baab63365e6d Mon Sep 17 00:00:00 2001
+From: Hib Eris <hib@hiberis.nl>
+Date: Mon, 22 Jun 2015 15:23:30 +0200
+Subject: [PATCH] Debianization: disable running mercurial tests
+
+This is needed to make this package build on the Ubuntu
+distributions at build.opensuse.org. These distributions
+provide only Ubuntu's main repository, which does not contain
+the mercurial package. The mercurial package is only needed
+to run mercurial tests, thus disabeling mercurial tests allows
+building the package.
+---
+ debian/control | 2 +-
+ tests/test.py  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/debian/control b/debian/control
+index a45fa04..6f3551d 100644
+--- a/debian/control
++++ b/debian/control
+@@ -2,7 +2,7 @@ Source: obs-service-tar-scm
+ Section: devel
+ Priority: extra
+ Maintainer: Daniel Gollub <dgollub@brocade.com>
+-Build-Depends: debhelper (>= 8.0.0), bzr, git, mercurial, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-unittest2, subversion
++Build-Depends: debhelper (>= 8.0.0), bzr, git, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-unittest2, subversion
+ Standards-Version: 3.9.3
+ Homepage: https://github.com/openSUSE/obs-service-tar_scm
+ X-Python-Version: >= 2.6
+diff --git a/tests/test.py b/tests/test.py
+index 3814e71..ca480b7 100755
+--- a/tests/test.py
++++ b/tests/test.py
+@@ -23,7 +23,7 @@ if __name__ == '__main__':
+         # temporarily comment out any of these:
+         SvnTests,
+         GitTests,
+-        HgTests,
++        #HgTests,
+         BzrTests,
+         UnitTestCases
+     ]
+-- 
+2.1.4
+

_service

@@ -1,10 +1,10 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
+    <param name="url">git://github.com/adrianschroeter/obs-service-tar_scm.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="version">git-master</param>
-    <param name="versionformat">0.5.3.%ct.%h</param>
+    <param name="versionformat">0.6.0~pre.%ct.%h</param>
     <param name="revision">master</param>
     <param name="changesgenerate">enable</param>
   </service>

_servicedata

@@ -1,6 +1,4 @@
 <servicedata>
 <service name="tar_scm">
-    <param name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
+            <param name="url">git://github.com/adrianschroeter/obs-service-tar_scm.git</param>
-    <param name="changesrevision">0b4ce51db91837c27e69912a2e7ec56fb0c863e4</param>
+          <param name="changesrevision">57c0bab02cbb6090d85f05e2b06ba9b1471176d9</param></service></servicedata>
-  </service>
-</servicedata>

debian.dsc

@@ -1,8 +1,9 @@
 Format: 1.0
-Source: obs-service-tar-scm
+Source: obs-service-tar_scm
 Version: 0.5.0
-Binary: obs-service-tar-scm
+Provides: obs-service-obs_scm, obs-service-tar
+Binary: obs-service-tar_scm
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 7), bzr, git, mercurial, python (>= 2.6), python-argparse | python (>= 2.7), subversion, python-unittest2, pep8, python-lxml
+Build-Depends: debhelper (>= 7), bzr, git, python (>= 2.6), python-argparse | python (>= 2.7), subversion, python-unittest2, pep8, python-lxml

debian.series

@@ -0,0 +1 @@
+0001-Debianization-disable-running-mercurial-tests.patch -p1

obs-service-tar_scm-0.5.3.1434983686.0b4ce51.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78e2a89a7f072169ca9eba47a56e86742273c3ed973defb127914845116f2690
-size 29882

obs-service-tar_scm-0.6.0~pre.1461681073.57c0bab.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df1b479406f570bac0c1ca94b719856eae5caf15821dfb568b7c8c67a16ea04b
+size 32819

obs-service-tar_scm.changes

@@ -1,3 +1,68 @@
+-------------------------------------------------------------------
+Tue Apr 26 13:44:48 UTC 2016 - adrian@suse.de
+
+- Update to version 0.6.0~pre.1461678268.e8b5d73:
+  * fix TESTING.md link in CONTRIBUTING.md
+  * Use correct level 2 bullet point (*)
+  * very first obs_scm implementation
+  * allow extracting of (spec) files
+  * allow to include local changes when using "obs_scm" service via local osc commands.
+  * make obsinfo parameter for tar service optional
+  * support filtering on creation of cpio archives
+  * - add debian provides
+
+-------------------------------------------------------------------
+Tue Apr 26 13:17:44 UTC 2016 - adrian@suse.de
+
+- add debian provides
+
+-------------------------------------------------------------------
+Fri Apr 15 08:16:32 UTC 2016 - adrian@suse.de
+
+- fix dependency on SLE 11 to python-argparse
+
+-------------------------------------------------------------------
+Mon Apr 11 15:09:29 UTC 2016 - mpluskal@suse.com
+
+- Correctly reference patch in previous entry
+
+-------------------------------------------------------------------
+Mon Apr 11 12:19:54 UTC 2016 - adrian@suse.de
+
+- Update to version 0.6.0~pre.1460377105.35a4ea4:
+  * support filtering on creation of cpio archives
+
+-------------------------------------------------------------------
+Fri Apr 08 07:00:48 UTC 2016 - adrian@suse.de
+
+- Update to version 0.6.0~pre.1460098798.dda5411:
+  + make obsinfo parameter for tar service optional
+
+-------------------------------------------------------------------
+Thu Apr 07 09:21:55 UTC 2016 - adrian@suse.de
+
+- Update to version 0.6.0.1460017418.4e4b2d6:
+  + Correct error message about lack of git tags
+  + GNUmakefile: Use default python in $PATH unless it is a python 3.
+  + fix TESTING.md link in CONTRIBUTING.md
+  + Use correct level 2 bullet point (*)
+  + very first obs_scm implementation
+  + allow extracting of (spec) files
+  + allow to include local changes when using "obs_scm" service via local osc commands.
+- building this pre-version currently from private branch
+  as discussed with Adam
+
+-------------------------------------------------------------------
+Wed Jul  8 14:04:53 UTC 2015 - bwiedemann@suse.com
+
+- only require git-core to not pull in git-web and gitk
+
+-------------------------------------------------------------------
+Wed Jun 24 08:07:29 UTC 2015 - hib@hiberis.nl
+
+- Fix build on Ubuntu by disabling mercurial tests
+  * 0001-Debianization-disable-running-mercurial-tests.patch
+
 -------------------------------------------------------------------
 Mon Jun 22 14:41:27 UTC 2015 - hib@hiberis.nl
 

obs-service-tar_scm.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package obs-service-tar_scm
+# spec file for package obs-service
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,25 +17,43 @@
 
 
 %define service tar_scm
+%define seperate_build 0
+
+%if "%seperate_build" == "1"
+%define version_unconverted 0.6.0~pre.1461681073.57c0bab
+
+Name:           obs-service-obs_scm
+%else
+%define version_unconverted 0.6.0~pre.1461681073.57c0bab
 
 Name:           obs-service-%{service}
-Version:        0.5.3.1434983686.0b4ce51
+#Obsoletes:      obs-service-obs_scm
+Provides:       obs-service-obs_scm = %version-%release
+%endif
+Provides:       obs-service-tar = %version-%release
+Version:        0.6.0~pre.1461681073.57c0bab
 Release:        0
 Summary:        An OBS source service: checkout or update a tar ball from svn/git/hg
 License:        GPL-2.0+
 Group:          Development/Tools/Building
 Url:            https://github.com/openSUSE/obs-service-%{service}
-Source:         %{name}-%{version}.tar.gz
+Source:         obs-service-tar_scm-%{version}.tar.gz
+# Fix build on Ubuntu by disabling mercurial tests, not applied in rpm
+# based distributions
+Patch0:         0001-Debianization-disable-running-mercurial-tests.patch
 BuildRequires:  bzr
-BuildRequires:  git
+BuildRequires:  git-core
 BuildRequires:  mercurial
 BuildRequires:  python >= 2.6
 BuildRequires:  python-lxml
 BuildRequires:  subversion
 Requires:       bzr
-Requires:       git
+Requires:       git-core
 Requires:       mercurial
 Requires:       subversion
+%if 0%{?suse_version} < 1315
+Requires:       python-argparse
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -45,13 +63,20 @@ This is a source service for openSUSE Build Service.
 It supports downloading from svn, git, hg and bzr repositories.
 
 %prep
-%setup -q
+%setup -q -n obs-service-tar_scm-%version
 
 %build
 
 %install
 make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}"
 
+%if "%seperate_build" == "1"
+rm %{buildroot}/%{_prefix}/lib/obs/service/tar_scm.service
+rm %{buildroot}/%{_prefix}/lib/obs/service/obs_scm
+mv %{buildroot}/%{_prefix}/lib/obs/service/{tar,obs}_scm
+ln -sf obs_scm %{buildroot}/%{_prefix}/lib/obs/service/tar
+%endif
+
 %if 0%{?suse_version} >= 1220
 %check
 # No need to run PEP8 tests here; that would require a potentially