Depend on the gbp-repocache package

The Git repository cached was split into a separate python module and
separate RPM package in obs-service-git-buildpackage.

Change-Id: I195f1e0a5e38b50322e39fd449aa9eae71814f0d
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/obs_service_gbs/command.py b/obs_service_gbs/command.py
index 427ffe4..1d74192 100644 (file)
--- a/obs_service_gbs/command.py
+++ b/obs_service_gbs/command.py
@@ -28,8 +28,16 @@ from ConfigParser import SafeConfigParser
 from gitbuildsys.cmd_export import main as cmd_export
 from gitbuildsys import log as gbs_log
 from gitbuildsys.errors import CmdError
+import gbp.log as gbplog
+
+import gbp_repocache
+from gbp_repocache import CachedRepo, CachedRepoError
+
+
+# Setup logging
+LOGGER = gbplog.getLogger('source_service')
+LOGGER.setLevel(gbplog.INFO)
 
-from obs_service_gbp import LOGGER, gbplog, CachedRepo, CachedRepoError
 
 class ServiceError(Exception):
     """Source service errors"""
@@ -139,6 +147,7 @@ def main(argv=None):
         if args.verbose == 'yes':
             gbplog.setup(color='auto', verbose=True)
             LOGGER.setLevel(gbplog.DEBUG)
+            gbp_repocache.LOGGER.setLevel(gbplog.DEBUG)
             gbs_log.setup(verbose=True)
         else:
             gbplog.setup(color='auto', verbose=False)

diff --git a/packaging/obs-service-gbs.spec b/packaging/obs-service-gbs.spec
index 5873748..0ccd5b1 100644 (file)
--- a/packaging/obs-service-gbs.spec
+++ b/packaging/obs-service-gbs.spec
@@ -14,14 +14,16 @@ Release:        %{pre_release}
 URL:            http://www.tizen.org
 Source:         %{name}-%{version}.tar.bz2
 Requires:       gbs-export
-Requires:       obs-service-git-buildpackage >= 0.2
+Requires:       git-buildpackage-common
+Requires:       gbp-repocache
 BuildRequires:  python
 BuildRequires:  python-setuptools
 %if 0%{?do_unittests}
 BuildRequires:  python-coverage
 BuildRequires:  python-nose
 BuildRequires:  gbs-export
-BuildRequires:  obs-service-git-buildpackage >= 0.2
+BuildRequires:  git-buildpackage-common
+BuildRequires:  gbp-repocache
 %endif
 BuildArch:      noarch