Make requirement on rpm-build strong on OpenSUSE

.gbp.conf

@@ -0,0 +1,25 @@
+[DEFAULT]
+# Do not merge to packaging (after update)
+merge=False
+# Vendor/Distro name
+vendor=Tizen
+# Package is from Debian
+upstream-tag=debian/%(version)s
+# Don't use pristine-tar
+pristine-tar=False
+# Branch naming
+packaging-branch=master
+upstream-branch=upstream
+# Tag format for releases
+packaging-tag = tizen/%(upstreamversion)s-%(nowtime)s
+# Subdir for RPM packaging data
+packaging-dir=packaging
+# Auto-generate patches against upstream
+patch-export = True
+patch-numbers = True
+patch-export-ignore-path = (.gbp.conf|packaging/.*|debian/.*)
+# Don't fail if the current branch does not match the main packaging branch
+ignore-branch = True
+
+[git-rpm-ch]
+changelog-revision=%(tagname)s

README

@@ -12,9 +12,6 @@ The API documentation of the gbp module can be found at:
 
     http://honk.sigxcpu.org/projects/git-buildpackage/apidocs/
 
-The mailing list is at:
+The documentation available for the RPM support can be found at
 
-    http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage
-    git-buildpackage at lists.sigxcpu.org
-
-See the HACKING document for details on contributing to gbp development.
+    http://marquiz.github.com/git-buildpackage-rpm/

TODO

@@ -1 +1,18 @@
 See https://honk.sigxcpu.org/piki/projects/git-buildpackage/
+
+RPM-related things:
+- unit tests:
+  - add unit tests for the rpm command line tools
+- manpages for rpm tools
+  - git-buildpackage-rpm
+  - git-import-srpm
+  - git-import-orig-rpm
+  - gbp-pq-rpm
+- better html-documentation for rpm support
+- write a tool for automatic changelog creation/updating
+- bare-repo support
+  - buildpackage-rpm
+  - import-orig
+  - import-srpm
+  - pristine-tar
+  - gbp-pq (very limited, if any)

debian/control

@@ -12,47 +12,45 @@ Build-Depends:
  perl,
  pychecker,
  python (>> 2.6.6-3~),
- python-coverage,
- python-dateutil,
  python-epydoc,
  python-mock,
  python-nose,
- python-nosexcover,
  python-pkg-resources,
  python-rpm,
  python-six,
  python-setuptools,
  sgml2x,
-# For the testsuite
- bzip2,
- cpio,
- devscripts (>= 2.13.8~),
- git (>= 1:1.7.9.1-1~),
- pristine-tar,
- rpm,
- unzip,
- zipmerge
 Standards-Version: 3.9.6
 Vcs-Git: git://honk.sigxcpu.org/git/git-buildpackage.git
 Vcs-Browser: https://git.sigxcpu.org/cgit/git-buildpackage/
 Homepage: https://honk.sigxcpu.org/piki/projects/git-buildpackage/
 X-Python-Version: >= 2.6
 
-Package: git-buildpackage
+
+Package: git-buildpackage-common
 Architecture: all
 Depends: ${python:Depends},
  ${shlibs:Depends},
  ${misc:Depends},
- devscripts (>= 2.13.5~),
  git (>= 1:1.7.9.1-1~),
  man-db,
- python-dateutil,
  python-pkg-resources,
  python-six,
 Recommends: pristine-tar (>= 0.5),
- cowbuilder | pbuilder | sbuild,
  python-requests
-Suggests: python-notify, unzip, sudo
+Suggests: python-notify, unzip
+Description: Suite to help with packaging in Git repositories
+ This package contains the common API and scripts for Debian and rpm packaging
+
+Package: git-buildpackage
+Architecture: all
+Depends: ${python:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends},
+ devscripts,
+ git-buildpackage-common (= ${binary:Version})
+Recommends: cowbuilder | pbuilder | sbuild,
+Suggests: sudo
 Description: Suite to help with Debian packages in Git repositories
  This package contains the following tools:
   * gbp import-{dsc,dscs}: import existing Debian source packages into a git
@@ -70,18 +68,31 @@ Architecture: all
 Depends: ${python:Depends},
  ${misc:Depends},
  cpio,
- git-buildpackage (= ${binary:Version}),
+ git-buildpackage-common (= ${binary:Version}),
  python-rpm,
  rpm,
-Recommends: pristine-tar (>= 0.5)
-Suggests: python-notify, unzip, zipmerge, mock
+Suggests: zipmerge, mock
 Description: Suite to help with RPM packages in Git repositories
  This package contains the following tools:
   * gbp buildpackage-rpm: build a package out of a git repository, check for
     local modifications and tag appropriately
   * gbp import-srpm: import existing RPM source packages into a git
     repository
   * gbp pq-rpm: manage patches easily
+  * git-import-orig-rpm: import a new upstream version into the git repository
  .
  These tools are currently in an experimental state. Branch names and
  repository layouts might change without lots of prior warning.
+
+Package: git-buildpackage-bb
+Architecture: all
+Depends: ${python:Depends},
+ ${misc:Depends},
+ git-buildpackage-common (= ${binary:Version}),
+ git-buildpackage-rpm (= ${binary:Version}),
+Recommends: bitbake
+Description: Suite to help with BitBake builds from Git repositories
+ This package contains the following tools:
+  * gbp import-bb: import sources from distribution repository
+  * gbp buildpackage-bb: build a package out of a Git repository
+  * gbp pq-bb: manage separate development and packaging branches

debian/git-buildpackage-bb.install

@@ -0,0 +1,2 @@
+usr/lib/python2.?/dist-packages/gbp/bb/
+usr/lib/python2.?/dist-packages/gbp/scripts/*bb*.py*

debian/doc-base → debian/git-buildpackage-common.doc-base

@@ -7,5 +7,5 @@ Abstract: git-buildpackage is a suite to help with Debian packages in Git
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/git-buildpackage/manual-html/index.html
-Files: /usr/share/doc/git-buildpackage/manual-html/*.html
+Index: /usr/share/doc/git-buildpackage-common/manual-html/index.html
+Files: /usr/share/doc/git-buildpackage-common/manual-html/*.html

debian/git-buildpackage-common.install

@@ -0,0 +1,22 @@
+usr/bin/gbp
+usr/lib/python2.?/dist-packages/gbp-*
+usr/lib/python2.?/dist-packages/gbp/command_wrappers.py
+usr/lib/python2.?/dist-packages/gbp/config.py
+usr/lib/python2.?/dist-packages/gbp/errors.py
+usr/lib/python2.?/dist-packages/gbp/format.py
+usr/lib/python2.?/dist-packages/gbp/git/
+usr/lib/python2.?/dist-packages/gbp/__init__.py
+usr/lib/python2.?/dist-packages/gbp/log.py
+usr/lib/python2.?/dist-packages/gbp/notifications.py
+usr/lib/python2.?/dist-packages/gbp/patch_series.py
+usr/lib/python2.?/dist-packages/gbp/pkg/
+usr/lib/python2.?/dist-packages/gbp/scripts/clone.py
+usr/lib/python2.?/dist-packages/gbp/scripts/common/
+usr/lib/python2.?/dist-packages/gbp/scripts/config.py
+usr/lib/python2.?/dist-packages/gbp/scripts/__init__.py
+usr/lib/python2.?/dist-packages/gbp/scripts/pull.py
+usr/lib/python2.?/dist-packages/gbp/scripts/supercommand.py
+usr/lib/python2.?/dist-packages/gbp/tmpfile.py
+usr/lib/python2.?/dist-packages/gbp/tristate.py
+usr/lib/python2.?/dist-packages/gbp/version.py
+etc/git-buildpackage/gbp.conf

debian/git-buildpackage-common.links

@@ -0,0 +1 @@
+/usr/share/doc/git-buildpackage-common/manual-html/gbp.html /usr/share/doc/git-buildpackage-common/manual-html/index.html

debian/git-buildpackage-common.manpages

@@ -0,0 +1,5 @@
+docs/gbp.1
+docs/gbp-clone.1
+docs/gbp.conf.5
+docs/gbp-config.1
+docs/gbp-pull.1

debian/git-buildpackage-rpm.install

@@ -1,5 +1,3 @@
 usr/bin/gbp-builder-mock /usr/share/git-buildpackage/
 usr/lib/python2.?/dist-packages/gbp/rpm/
-usr/lib/python2.7/dist-packages/gbp/scripts/import_srpm.py
-usr/lib/python2.7/dist-packages/gbp/scripts/pq_rpm.py
-usr/lib/python2.7/dist-packages/gbp/scripts/buildpackage_rpm.py
+usr/lib/python2.?/dist-packages/gbp/scripts/*rpm*.py*

debian/git-buildpackage.install

@@ -1,32 +1,10 @@
-usr/bin/gbp
 usr/bin/git-pbuilder
-usr/lib/python2.?/dist-packages/gbp-*
-usr/lib/python2.?/dist-packages/gbp/command_wrappers.py
-usr/lib/python2.?/dist-packages/gbp/config.py
 usr/lib/python2.?/dist-packages/gbp/dch.py
 usr/lib/python2.?/dist-packages/gbp/deb/
-usr/lib/python2.?/dist-packages/gbp/errors.py
-usr/lib/python2.?/dist-packages/gbp/format.py
-usr/lib/python2.?/dist-packages/gbp/git/
-usr/lib/python2.?/dist-packages/gbp/__init__.py
-usr/lib/python2.?/dist-packages/gbp/log.py
-usr/lib/python2.?/dist-packages/gbp/notifications.py
-usr/lib/python2.?/dist-packages/gbp/patch_series.py
-usr/lib/python2.?/dist-packages/gbp/pkg/
 usr/lib/python2.?/dist-packages/gbp/scripts/buildpackage.py
-usr/lib/python2.?/dist-packages/gbp/scripts/clone.py
-usr/lib/python2.?/dist-packages/gbp/scripts/common/
-usr/lib/python2.?/dist-packages/gbp/scripts/config.py
 usr/lib/python2.?/dist-packages/gbp/scripts/create_remote_repo.py
 usr/lib/python2.?/dist-packages/gbp/scripts/dch.py
 usr/lib/python2.?/dist-packages/gbp/scripts/import_dsc.py
 usr/lib/python2.?/dist-packages/gbp/scripts/import_dscs.py
 usr/lib/python2.?/dist-packages/gbp/scripts/import_orig.py
-usr/lib/python2.?/dist-packages/gbp/scripts/__init__.py
 usr/lib/python2.?/dist-packages/gbp/scripts/pq.py
-usr/lib/python2.?/dist-packages/gbp/scripts/pull.py
-usr/lib/python2.?/dist-packages/gbp/scripts/supercommand.py
-usr/lib/python2.?/dist-packages/gbp/tmpfile.py
-usr/lib/python2.?/dist-packages/gbp/tristate.py
-usr/lib/python2.?/dist-packages/gbp/version.py
-etc/git-buildpackage/gbp.conf

debian/git-buildpackage.manpages

@@ -1,13 +1,8 @@
-docs/gbp.1
 docs/gbp-buildpackage.1
-docs/gbp-clone.1
-docs/gbp.conf.5
-docs/gbp-config.1
 docs/gbp-create-remote-repo.1
 docs/gbp-dch.1
 docs/gbp-import-dsc.1
 docs/gbp-import-dscs.1
 docs/gbp-import-orig.1
 docs/gbp-pq.1
-docs/gbp-pull.1
 docs/git-pbuilder.1

debian/rules

@@ -1,5 +1,9 @@
 #!/usr/bin/make -f
-
+
+# HACK: disable checks, i.e. unit tests
+DEB_BUILD_OPTIONS += nocheck
+export WITHOUT_NOSETESTS := 1
+
 EXAMPLE_SCRIPTS=\
     gbp-add-patch          \
     gbp-cowbuilder-sid     \
@@ -46,6 +50,11 @@ override_dh_auto_install:
 
 override_dh_auto_clean:
 	dh_auto_clean
+	# Remove renamed files - renames are not correctly expressed in debian.diff
+	rm -f debian/doc-base
+	rm -f debian/docs
+	rm -f debian/examples
+	rm -f debian/manpages
 	rm -rf build/
 	make -C docs/ clean
 	-rm gbp/version.py

debian/source/format

@@ -1 +1 @@
-3.0 (native)
+1.0

debian/source/options

@@ -0,0 +1,2 @@
+extend-diff-ignore = "^(tests/data/rpm/.*|tests/component/rpm/data/.*|tests/component/deb/data/.*)"
+diff-ignore

docs/Makefile

@@ -15,6 +15,8 @@ MAN1S = \
         gbp-buildpackage-rpm \
         gbp-import-srpm \
         gbp-pq-rpm \
+        gbp-rpm-ch        \
+        gbp-import-orig-rpm \
         $(NULL)
 
 MAN5S = gbp.conf
@@ -34,9 +36,11 @@ GTK_DOC_CATALOG_FILE ?= /usr/share/sgml/gtk-doc/gtk-doc.cat
 
 all: $(MANUAL) $(MANPAGES)
 
-$(MANUAL): manual.sgml chapters/*.sgml manpages/*.sgml
+$(MANUAL): main.sgml manual.sgml manual-rpm.sgml chapters/*.sgml manpages/*.sgml
 ifeq ($(HAVE_SGML2X),1)
 	docbook-2-html -s local $<
+	rm -rf $(MANUAL)
+	mv main-html $(MANUAL)
 else
 	docbook2html -d local-nosgml2x.dsl -c $(GTK_DOC_CATALOG_FILE) -o $(MANUAL) $<
 endif
@@ -58,7 +62,7 @@ manpage.refs: $(BUILD_MAN_XREF_PAGES)
 git-pbuilder.1: ../bin/git-pbuilder
 	pod2man $< $@
 
-manual.sgml: $(VERSION_ENT)
+main.sgml: $(VERSION_ENT)
 
 $(VERSION_ENT): $(GBP_VERSION)
 	echo '<!ENTITY gbp-version "$(DEB_VERSION)">' > $(VERSION_ENT)