From d67981a0fcbae5df9d31b582d1081355e47cc54338908d3d4c2a0ec3aeea9c1f Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Thu, 23 Mar 2017 10:10:35 +0000 Subject: [PATCH 1/3] - Update to version 0.7.0.1490263157.682db30: * fix local checkout when running in osc * force remove of files while 'make clean' * fix: also exclude directories when called .git * Provide version rewrite using a regex pattern and replacement. * fix problems with generatechanges when ~/.obs/tar_scm exists * initial appimage support * make pep8 happy again * test cases for version rewrite * new parameter --match-tag to filter tags OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=146 --- _servicedata | 2 +- obs-service-tar_scm-0.7.0.1484082405.7671be8.tar.gz | 3 --- obs-service-tar_scm-0.7.0.1490263157.682db30.tar.gz | 3 +++ obs-service-tar_scm.changes | 10 ++++++++++ obs-service-tar_scm.spec | 6 +++--- 5 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 obs-service-tar_scm-0.7.0.1484082405.7671be8.tar.gz create mode 100644 obs-service-tar_scm-0.7.0.1490263157.682db30.tar.gz diff --git a/_servicedata b/_servicedata index c0aeaca..1c513df 100644 --- a/_servicedata +++ b/_servicedata @@ -3,4 +3,4 @@ git://github.com/adrianschroeter/obs-service-tar_scm.git d44d677cf006d48b261f5e2054ba2126bed64ae1 git://github.com/M0ses/obs-service-tar_scm.git - 7671be8f317658daec2bb24970bcba791396d9bd \ No newline at end of file + 2f9c459208778d816f707b5bf7c0e4e7c54c6eb6 \ No newline at end of file diff --git a/obs-service-tar_scm-0.7.0.1484082405.7671be8.tar.gz b/obs-service-tar_scm-0.7.0.1484082405.7671be8.tar.gz deleted file mode 100644 index 06c59c3..0000000 --- a/obs-service-tar_scm-0.7.0.1484082405.7671be8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d14331e0bef2301d4ec4133c74820ba70e942d04aae46aae9605122826f2f61 -size 46080 diff --git a/obs-service-tar_scm-0.7.0.1490263157.682db30.tar.gz b/obs-service-tar_scm-0.7.0.1490263157.682db30.tar.gz new file mode 100644 index 0000000..5a7095f --- /dev/null +++ b/obs-service-tar_scm-0.7.0.1490263157.682db30.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:783111126dbd75021bf47d4740c2b76c8451840a51d62d43bd387e51ec61c0be +size 47561 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 12225cc..ce1b713 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Mar 23 10:09:38 UTC 2017 - opensuse-packaging@opensuse.org + +- Update to version 0.7.0.1490263157.682db30: + * Provide version rewrite using a regex pattern and replacement. + * initial appimage support + * make pep8 happy again + * test cases for version rewrite + * new parameter --match-tag to filter tags + ------------------------------------------------------------------- Tue Feb 28 13:45:43 UTC 2017 - dimstar@opensuse.org diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 589e87f..b85099e 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -20,18 +20,18 @@ %define seperate_build 0 %if "%seperate_build" == "1" -%define version_unconverted 0.7.0.1484082405.7671be8 +%define version_unconverted 0.7.0.1490263157.682db30 Name: obs-service-obs_scm %else -%define version_unconverted 0.7.0.1484082405.7671be8 +%define version_unconverted 0.7.0.1490263157.682db30 Name: obs-service-%{service} #Obsoletes: obs-service-obs_scm Provides: obs-service-obs_scm = %version-%release %endif Provides: obs-service-tar = %version-%release -Version: 0.7.0.1484082405.7671be8 +Version: 0.7.0.1490263157.682db30 Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ From 7cd2f7ece63ffcb0a482324f826c5f3a9313d550658c28e12be64c80c80de68d Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Fri, 24 Mar 2017 12:56:23 +0000 Subject: [PATCH 2/3] - Update to version 0.7.0.1490358243.8de854e: * keep .gitlab/.github directories OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=147 --- _servicedata | 2 +- obs-service-tar_scm-0.7.0.1490263157.682db30.tar.gz | 3 --- obs-service-tar_scm-0.7.0.1490358243.8de854e.tar.gz | 3 +++ obs-service-tar_scm.changes | 6 ++++++ obs-service-tar_scm.spec | 6 +++--- 5 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 obs-service-tar_scm-0.7.0.1490263157.682db30.tar.gz create mode 100644 obs-service-tar_scm-0.7.0.1490358243.8de854e.tar.gz diff --git a/_servicedata b/_servicedata index 1c513df..99b88bd 100644 --- a/_servicedata +++ b/_servicedata @@ -3,4 +3,4 @@ git://github.com/adrianschroeter/obs-service-tar_scm.git d44d677cf006d48b261f5e2054ba2126bed64ae1 git://github.com/M0ses/obs-service-tar_scm.git - 2f9c459208778d816f707b5bf7c0e4e7c54c6eb6 \ No newline at end of file + b742dfc0e12755cf306a95439494b5bdde7c0c61 \ No newline at end of file diff --git a/obs-service-tar_scm-0.7.0.1490263157.682db30.tar.gz b/obs-service-tar_scm-0.7.0.1490263157.682db30.tar.gz deleted file mode 100644 index 5a7095f..0000000 --- a/obs-service-tar_scm-0.7.0.1490263157.682db30.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:783111126dbd75021bf47d4740c2b76c8451840a51d62d43bd387e51ec61c0be -size 47561 diff --git a/obs-service-tar_scm-0.7.0.1490358243.8de854e.tar.gz b/obs-service-tar_scm-0.7.0.1490358243.8de854e.tar.gz new file mode 100644 index 0000000..d4b87aa --- /dev/null +++ b/obs-service-tar_scm-0.7.0.1490358243.8de854e.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a10f39883af553b7c0dd85e1015ec9d4da208c5070513da99c95c768343506b +size 47955 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index ce1b713..1b9cf3b 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 24 12:55:48 UTC 2017 - opensuse-packaging@opensuse.org + +- Update to version 0.7.0.1490358243.8de854e: + * keep .gitlab/.github directories + ------------------------------------------------------------------- Thu Mar 23 10:09:38 UTC 2017 - opensuse-packaging@opensuse.org diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index b85099e..5812efe 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -20,18 +20,18 @@ %define seperate_build 0 %if "%seperate_build" == "1" -%define version_unconverted 0.7.0.1490263157.682db30 +%define version_unconverted 0.7.0.1490358243.8de854e Name: obs-service-obs_scm %else -%define version_unconverted 0.7.0.1490263157.682db30 +%define version_unconverted 0.7.0.1490358243.8de854e Name: obs-service-%{service} #Obsoletes: obs-service-obs_scm Provides: obs-service-obs_scm = %version-%release %endif Provides: obs-service-tar = %version-%release -Version: 0.7.0.1490263157.682db30 +Version: 0.7.0.1490358243.8de854e Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ From db78b11285fe9818d7facfb56fc2781bc5c84c8dc175c91f38b282d64abe078a Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Fri, 24 Mar 2017 16:44:55 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=148 --- obs-service-tar_scm.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 5812efe..09f7db2 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -45,7 +45,11 @@ BuildRequires: bzr BuildRequires: git-core BuildRequires: mercurial BuildRequires: python >= 2.6 +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +BuildRequires: PyYAML +%else BuildRequires: python-PyYAML +%endif BuildRequires: python-dateutil BuildRequires: python-lxml BuildRequires: python-mock @@ -53,7 +57,11 @@ BuildRequires: subversion Requires: bzr Requires: git-core Requires: mercurial +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +Requires: PyYAML +%else Requires: python-PyYAML +%endif Requires: python-dateutil Requires: subversion %if 0%{?suse_version} < 1315