diff --git a/PKGBUILD b/PKGBUILD index 9baf229..604c1e3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.6.1551448746.2759df2 +pkgver=0.10.6.1551887937.e42c270 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index e594270..aae1607 100644 --- a/_servicedata +++ b/_servicedata @@ -5,4 +5,4 @@ git://github.com/M0ses/obs-service-tar_scm.git b742dfc0e12755cf306a95439494b5bdde7c0c61 git://github.com/openSUSE/obs-service-tar_scm.git - d22a680f302b08c1ae4c3fe14de5083d90b0eb76 \ No newline at end of file + 689f06bdad912d238ee2714eeae9f53218953b9a \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 1847d67..bf65f7c 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.6.1551448746.2759df2 +Version: 0.10.6.1551887937.e42c270 Provides: obs-service-obs_scm, obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter diff --git a/obs-service-tar_scm-0.10.6.1551448746.2759df2.tar.gz b/obs-service-tar_scm-0.10.6.1551448746.2759df2.tar.gz deleted file mode 100644 index 37389d6..0000000 --- a/obs-service-tar_scm-0.10.6.1551448746.2759df2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97c78ee2a4cdc6d171845827b24e0f13594a32ebc4bda9e93e321ee3e3b8fc7e -size 67770 diff --git a/obs-service-tar_scm-0.10.6.1551887937.e42c270.tar.gz b/obs-service-tar_scm-0.10.6.1551887937.e42c270.tar.gz new file mode 100644 index 0000000..7d936ce --- /dev/null +++ b/obs-service-tar_scm-0.10.6.1551887937.e42c270.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:793ceaa98a3c15ebcd01886275aaec9bb051b914097bfd1ab16ecf773664ee70 +size 67763 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index a3c4ec9..af57ff4 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 06 15:59:39 UTC 2019 - adrian@suse.de + +- Update to version 0.10.6.1551887937.e42c270: + * Require packages to get the en_US.UTF-8 locales + ------------------------------------------------------------------- Fri Mar 01 14:01:54 UTC 2019 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 6f38e59..93f9092 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -16,11 +16,22 @@ # +%if 0%{?suse_version} +%if 0%{?suse_version} >= 1550 +%define locale_package glibc-locale-base +%else +%define locale_package glibc-locale +%endif +%endif +%if %{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +%define locale_package glibc-langpack-en +%endif + %bcond_without obs_scm_testsuite Name: obs-service-tar_scm -%define version_unconverted 0.10.6.1551448746.2759df2 -Version: 0.10.6.1551448746.2759df2 +%define version_unconverted 0.10.6.1551887937.e42c270 +Version: 0.10.6.1551887937.e42c270 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -31,12 +42,12 @@ Source: %{name}-%{version}.tar.gz # based distributions #Patch0: 0001-Debianization-disable-running-mercurial-tests.patch %if %{with obs_scm_testsuite} +BuildRequires: %{locale_package} BuildRequires: bzr BuildRequires: git-core BuildRequires: mercurial BuildRequires: subversion %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} -BuildRequires: glibc-common %define py_compile(O) \ find %1 -name '*.pyc' -exec rm -f {} \\; \ python -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \ @@ -47,7 +58,6 @@ python -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_ BuildRequires: PyYAML %else -BuildRequires: glibc-locale BuildRequires: python-PyYAML %endif BuildRequires: python-dateutil @@ -63,7 +73,6 @@ Requires: git-core Recommends: bzr Recommends: mercurial Recommends: subversion -Recommends: glibc-locale %endif Requires: obs-service-obs_scm-common = %version-%release BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -77,6 +86,7 @@ It supports downloading from svn, git, hg and bzr repositories. %package -n obs-service-obs_scm-common Summary: Common parts of SCM handling services Group: Development/Tools/Building +Requires: %{locale_package} Requires: python-dateutil %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} Requires: PyYAML