From f11bab089b1df74474e9186b8ea0235c08239876 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 2 May 2013 14:02:01 +0300 Subject: [PATCH] Moved gbs export to separate package gbs export is used by gbs build service, so it's better to have it separated. Change-Id: Ide54579ac3c4a88225ab77cf5410155026c938fc Signed-off-by: Ed Bartosh --- debian/control | 12 ++++++++++++ debian/gbs-api.install | 1 + debian/gbs-export.install | 1 + debian/gbs.install | 11 +++++++++-- packaging/gbs.dsc | 2 +- packaging/gbs.spec | 29 ++++++++++++++++++++++++++++- 6 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 debian/gbs-export.install diff --git a/debian/control b/debian/control index 95e9b88..16b13ba 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Depends: ${misc:Depends}, ${python:Depends}, osc (>= 0.139.0), git-buildpackage-rpm (>= 0.6.0git20121124-tizen20130308), gbs-api (= ${binary:Version}), + gbs-export (= ${binary:Version}), depanneur (>= 0.6), pristine-tar (>= 1.26) Recommends: librpm-tizen (>= 4.11.0.1.tizen20130304-tizen20130307) @@ -33,3 +34,14 @@ Replaces: gbs (<< 0.15) Description: GBS API This package contains gbs APIs, which can be used by external software. + +Package: gbs-export +Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, + gbs-api, + git-buildpackage-rpm +Conflicts: gbs (<< 0.15) +Replaces: gbs (<< 0.15) +Description: GBS export API + This package contains gbs export APIs, which can be used by + external software. diff --git a/debian/gbs-api.install b/debian/gbs-api.install index 99b060c..e15459d 100644 --- a/debian/gbs-api.install +++ b/debian/gbs-api.install @@ -3,5 +3,6 @@ usr/lib/python*/*packages/gitbuildsys/oscapi.py usr/lib/python*/*packages/gitbuildsys/errors.py usr/lib/python*/*packages/gitbuildsys/log.py usr/lib/python*/*packages/gitbuildsys/safe_url.py +usr/lib/python*/*packages/gitbuildsys/conf.py usr/lib/python*/*packages/gitbuildsys/utils.py usr/lib/python*/*packages/gbs-*.egg-info diff --git a/debian/gbs-export.install b/debian/gbs-export.install new file mode 100644 index 0000000..9f292df --- /dev/null +++ b/debian/gbs-export.install @@ -0,0 +1 @@ +usr/lib/python*/*packages/gitbuildsys/cmd_export.py diff --git a/debian/gbs.install b/debian/gbs.install index 8ab22b8..1fffd18 100644 --- a/debian/gbs.install +++ b/debian/gbs.install @@ -1,5 +1,12 @@ -usr/lib/python*/*packages/gitbuildsys/cmd_*.py -usr/lib/python*/*packages/gitbuildsys/conf.py +usr/lib/python*/*packages/gitbuildsys/cmd_build.py +usr/lib/python*/*packages/gitbuildsys/cmd_changelog.py +usr/lib/python*/*packages/gitbuildsys/cmd_chroot.py +usr/lib/python*/*packages/gitbuildsys/cmd_clone.py +usr/lib/python*/*packages/gitbuildsys/cmd_createimage.py +usr/lib/python*/*packages/gitbuildsys/cmd_import.py +usr/lib/python*/*packages/gitbuildsys/cmd_pull.py +usr/lib/python*/*packages/gitbuildsys/cmd_remotebuild.py +usr/lib/python*/*packages/gitbuildsys/cmd_submit.py usr/lib/python*/*packages/gitbuildsys/parsing.py usr/bin/* etc/bash_completion.d/* diff --git a/packaging/gbs.dsc b/packaging/gbs.dsc index e5888eb..8512442 100644 --- a/packaging/gbs.dsc +++ b/packaging/gbs.dsc @@ -1,7 +1,7 @@ Format: 1.0 Source: gbs Version: 0.15 -Binary: gbs, gbs-api +Binary: gbs, gbs-api, gbs-export Maintainer: Jian-feng Ding Architecture: all Standards-Version: 3.7.1 diff --git a/packaging/gbs.spec b/packaging/gbs.spec index d453150..5f9ff39 100644 --- a/packaging/gbs.spec +++ b/packaging/gbs.spec @@ -24,6 +24,7 @@ Requires: python-argparse Requires: librpm-tizen >= 4.11.0.1.tizen20130304-tizen20130307 %endif Requires: %{name}-api = %{version} +Requires: %{name}-export = %{version} BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,6 +45,18 @@ Requires: git-buildpackage-rpm This package contains gbs APIs, which can be used by external software. +%package export +Summary: GBS export module +Conflicts: gbs < 0.15 +Requires: python +Requires: gbs-api +Requires: git-buildpackage-rpm + +%description export +This package contains gbs export APIs, which can be used by +external software. + + %prep %setup -q -n %{name}-%{version} @@ -65,7 +78,15 @@ rm -rf %{buildroot} %doc README.rst docs/RELEASE_NOTES #%{_mandir}/man1/* %{python_sitelib}/gitbuildsys/cmd_*.py* -%{python_sitelib}/gitbuildsys/conf.py* +%{python_sitelib}/gitbuildsys/cmd_build.py +%{python_sitelib}/gitbuildsys/cmd_changelog.py +%{python_sitelib}/gitbuildsys/cmd_chroot.py +%{python_sitelib}/gitbuildsys/cmd_clone.py +%{python_sitelib}/gitbuildsys/cmd_createimage.py +%{python_sitelib}/gitbuildsys/cmd_import.py +%{python_sitelib}/gitbuildsys/cmd_pull.py +%{python_sitelib}/gitbuildsys/cmd_remotebuild.py +%{python_sitelib}/gitbuildsys/cmd_submit.py %{python_sitelib}/gitbuildsys/parsing.py* %{_bindir}/* %{_sysconfdir}/bash_completion.d @@ -78,5 +99,11 @@ rm -rf %{buildroot} %{python_sitelib}/gitbuildsys/errors.py* %{python_sitelib}/gitbuildsys/log.py* %{python_sitelib}/gitbuildsys/safe_url.py* +%{python_sitelib}/gitbuildsys/conf.py* %{python_sitelib}/gitbuildsys/utils.py* %{python_sitelib}/gbs-*-py*.egg-info + +%files export +%defattr(-,root,root,-) +%{python_sitelib}/gitbuildsys/cmd_export.py* + -- 2.7.4