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 <eduard.bartosh@intel.com>

diff --git a/debian/control b/debian/control
index 95e9b881e45032579ca1675e8104cf9de8e5655c..16b13ba8b35414311ba0f540ee5bd26eba044da4 100644 (file)
--- 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 99b060cccd4615d75a591811144498ed24f0a9eb..e15459de39a37ec257767cba189369fcf5e44f80 100644 (file)
--- 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 (file)
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 8ab22b8382dcaeecd9f472aac2b0c20f372b8980..1fffd185726b31d1c8a2c2a5c2e3e3ff7b1bad6c 100644 (file)
--- 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 e5888eb7e876b0f6e59df1a013fada2f530dc747..8512442ce02ded6a41928d79a240fef4cb4772c1 100644 (file)
--- 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 <jian-feng.ding@intel.com>
 Architecture: all
 Standards-Version: 3.7.1

diff --git a/packaging/gbs.spec b/packaging/gbs.spec
index d453150f05945e83f8502c89b1c416adfc43f7af..5f9ff39fede4f6b8de27df2dc6fdb9f17bbe1e3b 100644 (file)
--- 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*
+