From bb41b6393585caa6df065cbc5c7103fb64293e88 Mon Sep 17 00:00:00 2001 From: Zhang Qiang Date: Fri, 18 Oct 2013 08:01:20 +0800 Subject: [PATCH] Update dependencies: - depend on new pristine-tar 1.28 version - dependencies of gbs subpackages: gbs --> gbs-api, gbs-export, gbs-remotbuild gbs-export->gbs-api gbs-remotebuild-> gbs-api, gbs-export. Change-Id: I3fb39dd04c18639ace37ca7a9042683dd5464449 --- debian/control | 7 ++++--- packaging/gbs.spec | 12 +++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index fe7960c..3586b4c 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,6 @@ Depends: ${misc:Depends}, ${python:Depends}, gbs-export (= ${binary:Version}), gbs-remotebuild (= ${binary:Version}), depanneur (>= 0.10), - pristine-tar (>= 1.26), mic (>= 0.20) Recommends: librpm-tizen (>= 4.11.0.1.tizen20130618-tizen20131001) Description: Command line tools for Tizen package developers @@ -40,7 +39,8 @@ Description: GBS API Package: gbs-export Architecture: all Depends: ${misc:Depends}, ${python:Depends}, - gbs-api, + gbs-api (= ${binary:Version}), + pristine-tar (>= 1.28), git-buildpackage-rpm Conflicts: gbs (<< 0.15) Replaces: gbs (<< 0.15) @@ -51,7 +51,8 @@ Description: GBS export API Package: gbs-remotebuild Architecture: all Depends: ${misc:Depends}, ${python:Depends}, - gbs-api, + gbs-api (= ${binary:Version}), + gbs-export (= ${binary:Version}), git-buildpackage-rpm Conflicts: gbs (<< 0.18.1) Replaces: gbs (<< 0.18.1) diff --git a/packaging/gbs.spec b/packaging/gbs.spec index 6532e68..be061f5 100644 --- a/packaging/gbs.spec +++ b/packaging/gbs.spec @@ -23,9 +23,9 @@ Requires: python-argparse %if ! 0%{?tizen_version:1} Requires: rpm-tizen >= 4.11.0.1.tizen20130618-tizen20131001 %endif -Requires: %{name}-api = %{version} -Requires: %{name}-export = %{version} -Requires: %{name}-remotebuild = %{version} +Requires: %{name}-api = %{version}-%{release} +Requires: %{name}-export = %{version}-%{release} +Requires: %{name}-remotebuild = %{version}-%{release} BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,7 +50,8 @@ external software. Summary: GBS export module Conflicts: gbs < 0.15 Requires: python -Requires: gbs-api +Requires: pristine-tar >= 1.28 +Requires: gbs-api = %{version}-%{release} Requires: git-buildpackage-rpm %description export @@ -61,7 +62,8 @@ external software. Summary: GBS remotebuild module Conflicts: gbs < 0.18.1 Requires: python -Requires: gbs-api +Requires: gbs-api = %{version}-%{release} +Requires: gbs-export = %{version}-%{release} Requires: git-buildpackage-rpm %description remotebuild -- 2.7.4