Updated spec to allow the same content for rpm and deb packages

Change-Id: I4c2b482c5f3fbe1c3abac9f41f0f5155c90803c8

diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index 6a795e2465a69fdd995e17d255fd3937cc88f191..21cc3c2e3f62c337065c89ef599e4a4189877a6b 100644 (file)
--- a/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
@@ -1,17 +1,18 @@
 Name:       git-buildpackage
 Summary:    Build packages from git
-Version:    0.6.0_git20120419
+Version:    0.6.0git20120419
 Release:    0
 Group:      Development/Tools/Building
 License:    GPLv2
 BuildArch:  noarch
 URL:        https://honk.sigxcpu.org/piki/projects/git-buildpackage/
-Source0:    %{name}-%{version}.tar.bz2
+Source0:    %{name}_%{version}.tar.gz
 # >> gbp-patch-tags         # auto-added by gbp
 # << gbp-patch-tags         # auto-added by gbp
 Requires:   %{name}-common = %{version}-%{release}
+Requires:   dpkg
 BuildRequires:  python
-BuildRequires:  python-distribute
+BuildRequires:  python-setuptools
 BuildRequires:  docbook-utils
 BuildRequires:  gtk-doc
 BuildRequires:  epydoc
@@ -26,13 +27,9 @@ This package contains the original Debian tools.
 %package common
 Summary:    Common files for git-buildpackage debian and rpm tools
 Group:      Development/Tools/Building
-Requires:   git
 Requires:   git-core
 Requires:   python-base
 Requires:   python-dateutil
-Requires:   dpkg
-Requires:   rpm
-Requires:   rpm-python
 
 %description common
 Common files and documentation, used by both git-buildpackage debian and rpm tools
@@ -42,6 +39,8 @@ Common files and documentation, used by both git-buildpackage debian and rpm too
 Summary:    Build RPM packages from git
 Group:      Development/Tools/Building
 Requires:   %{name}-common = %{version}-%{release}
+Requires:   rpm
+Requires:   rpm-python
 
 
 %description rpm
@@ -73,7 +72,7 @@ HAVE_SGML2X=0 make -C docs/
 %install
 rm -rf %{buildroot}
 python ./setup.py install --root=%{buildroot} --prefix=/usr
-
+rm -rf %{buildroot}%{python_sitelib}/*info
 
 
 %files
@@ -85,15 +84,19 @@ python ./setup.py install --root=%{buildroot} --prefix=/usr
 %{_bindir}/git-import-dscs
 %{_bindir}/git-import-orig
 %{_bindir}/git-pbuilder
-
+%{_bindir}/gbp-create-remote-repo
+%{python_sitelib}/gbp/deb/
 
 %files common
 %defattr(-,root,root,-)
 %{_bindir}/gbp-clone
-%{_bindir}/gbp-create-remote-repo
 %{_bindir}/gbp-pull
-%{python_sitelib}/gbp/
-%{python_sitelib}/*info
+%{python_sitelib}/gbp
+%{python_sitelib}/gbp/*.py*
+%{python_sitelib}/gbp/git/
+%{python_sitelib}/gbp/pkg/
+%{python_sitelib}/gbp/scripts/clone.py*
+%{python_sitelib}/gbp/scripts/pull.py*
 %config %{_sysconfdir}/git-buildpackage
 
 
@@ -103,3 +106,4 @@ python ./setup.py install --root=%{buildroot} --prefix=/usr
 %{_bindir}/git-buildpackage-rpm
 %{_bindir}/git-import-orig-rpm
 %{_bindir}/git-import-srpm
+%{python_sitelib}/gbp/rpm/