From 082985ee422f1b0e693e2800db5afa2f1a4282ba Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: May 02 2017 13:03:13 +0000 Subject: new version --- diff --git a/.gitignore b/.gitignore index d417051..2f609d0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /module-build-service-1.3.18.tar.gz /module-build-service.spec /module-build-service-1.3.20.tar.gz +/module-build-service-1.3.21.tar.gz diff --git a/mbs-1.3.20-mock.patch b/mbs-1.3.20-mock.patch deleted file mode 100644 index c294e05..0000000 --- a/mbs-1.3.20-mock.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/conf/config.py b/conf/config.py -index 0dc82f3..5f3e87c 100644 ---- a/conf/config.py -+++ b/conf/config.py -@@ -30,13 +30,13 @@ class BaseConfiguration(object): - KOJI_PROFILE = 'koji' - KOJI_ARCHES = ['i686', 'armv7hl', 'x86_64'] - KOJI_PROXYUSER = True -- KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos' -+ KOJI_REPOSITORY_URL = 'https://kojipkgs.fedoraproject.org/repos' - KOJI_TAG_PREFIXES = ['module'] - COPR_CONFIG = '/etc/module-build-service/copr.conf' -- PDC_URL = 'http://modularity.fedorainfracloud.org:8080/rest_api/v1' -+ PDC_URL = 'http://pdc.fedoraproject.org/rest_api/v1' - PDC_INSECURE = True - PDC_DEVELOP = True -- SCMURLS = ["git://pkgs.stg.fedoraproject.org/modules/"] -+ SCMURLS = ["git://pkgs.fedoraproject.org/modules/"] - YAML_SUBMIT_ALLOWED = False - - # How often should we resort to polling, in seconds -@@ -60,7 +60,7 @@ class BaseConfiguration(object): - SSL_CERTIFICATE_KEY_FILE = '/etc/module-build-service/server.key' - SSL_CA_CERTIFICATE_FILE = '/etc/module-build-service/cacert.pem' - -- PKGDB_API_URL = 'https://admin.stg.fedoraproject.org/pkgdb/api' -+ PKGDB_API_URL = 'https://admin.fedoraproject.org/pkgdb/api' - - ALLOWED_GROUPS = set([ - 'packager', -diff --git a/module_build_service/builder/__init__.py b/module_build_service/builder/__init__.py -index 99c3c8b..d28d06f 100644 ---- a/module_build_service/builder/__init__.py -+++ b/module_build_service/builder/__init__.py -@@ -9,9 +9,9 @@ __all__ = [ - - GenericBuilder.register_backend_class(KojiModuleBuilder) - --if conf.system == "mock": -- from MockModuleBuilder import MockModuleBuilder -- GenericBuilder.register_backend_class(MockModuleBuilder) -+#if conf.system == "mock": -+from MockModuleBuilder import MockModuleBuilder -+GenericBuilder.register_backend_class(MockModuleBuilder) - - if conf.system == "copr": - from CoprModuleBuilder import CoprModuleBuilder diff --git a/module-build-service.spec b/module-build-service.spec index 8af8bc9..8108d1e 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,13 +1,12 @@ Name: module-build-service -Version: 1.3.20 -Release: 5%{?dist} +Version: 1.3.21 +Release: 1%{?dist} Summary: The Module Build Service for Modularity Group: Development/Tools License: MIT URL: https://pagure.io/fm-orchestrator Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz -Patch0: mbs-1.3.20-mock.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -120,8 +119,6 @@ for a number of tasks: %prep %setup -q -%patch0 -p1 - # Simply remove an old .pyc file that was included in one release. rm -f module_build_service/scheduler/consumer.pyc # And this weird sqlite file that made it in... @@ -170,6 +167,9 @@ done %changelog +* Tue May 02 2017 Jan Kaluza - 1.3.21-1 +- new version + * Thu Apr 20 2017 Jan Kaluza - 1.3.20-5 - add python2-system dependency diff --git a/sources b/sources index 831cf8a..c12a3dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-1.3.20.tar.gz) = b8f81ae4d0cba44d17965bfecf98251e951d8ce527cccfef943d2eadbf8b3d80e58d74b230fcd968108f60918fb314613c4d1df59daeb391da8f33bef31dddf8 +SHA512 (module-build-service-1.3.21.tar.gz) = 37cb161a64929597e79511fb4a647ad4d29f84a4335bfb4039b388a14e1a1ba55fbc1593201e2bb5bba4d3ec597a42f5dd8b1f701d7072f5540b8b59617ea958