Adapt to latest gbp

Change-Id: Ib7a61b271f1f01917bf93e98f680c2bbe67ca521
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/packaging/0002-openSUSE-HACK-add-upstream-bzip2-v1.0.6-sources.patch b/packaging/0002-openSUSE-HACK-add-upstream-bzip2-v1.0.6-sources.patch
index a717bb53a47c02d78199e5238edb6b7d7fddd7e1..cddcb9fbd1a30c1acca14ce2f6b2e2a508dc3363 100644 (file)
--- a/packaging/0002-openSUSE-HACK-add-upstream-bzip2-v1.0.6-sources.patch
+++ b/packaging/0002-openSUSE-HACK-add-upstream-bzip2-v1.0.6-sources.patch
@@ -5,8 +5,10 @@ Subject: openSUSE HACK: add upstream bzip2 (v1.0.6) sources
 Only take the selected files that are needed. Needed for being able to
 correctly re-create bz2 archives on openSUSE.
 
-Gbp-Rpm-If: 0%{?suse_version}
+Gbp-Rpm: If 0%{?suse_version}
+Gbp: Ignore
 
+Change-Id: I0b7848774f5a0b7bd69de853de3d04bbbbc7f3fd
 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
 ---
  pit/upstream-bzip2/LICENSE         |   42 +

diff --git a/packaging/0003-openSUSE-HACK-modify-Makefile-in-upstream-bzip2.patch b/packaging/0003-openSUSE-HACK-modify-Makefile-in-upstream-bzip2.patch
index 581a34ecb0b39e69bb2a92de25b5c65425eb5bd3..6aa4c70dbfb372635c68c64e9da0a469d6c3e3eb 100644 (file)
--- a/packaging/0003-openSUSE-HACK-modify-Makefile-in-upstream-bzip2.patch
+++ b/packaging/0003-openSUSE-HACK-modify-Makefile-in-upstream-bzip2.patch
@@ -4,8 +4,10 @@ Subject: openSUSE HACK: modify Makefile in upstream-bzip2
 
 To make the (only partially imported) upstream-bzip2 compile.
 
-Gbp-Rpm-If: 0%{?suse_version}
+Gbp-Rpm: If 0%{?suse_version}
+Gbp: Ignore
 
+Change-Id: Id74e43aa3d913d0cb52f3866d5434d5ff92f2aaf
 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
 ---
  pit/upstream-bzip2/Makefile |    3 +--

diff --git a/packaging/0004-openSUSE-HACK-enable-special-upstream-bzip2.patch b/packaging/0004-openSUSE-HACK-enable-special-upstream-bzip2.patch
index c4ad58b3eaff13285620f98bcb862cd0415de4cc..7d86b935b870589416d5654c6a22537d519f9020 100644 (file)
--- a/packaging/0004-openSUSE-HACK-enable-special-upstream-bzip2.patch
+++ b/packaging/0004-openSUSE-HACK-enable-special-upstream-bzip2.patch
@@ -7,8 +7,10 @@ This is a hack for openSUSE that makes pristine-bz2 use a special
 is unable to re-create/gendelta bz2 archives created by other
 distributions.
 
-Gbp-Rpm-If: 0%{?suse_version}
+Gbp-Rpm: If 0%{?suse_version}
+Gbp: Ignore
 
+Change-Id: Icfcbee5207e65820248172152623a4dbf4440131
 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
 ---
  Makefile.PL  |    5 +++++

diff --git a/packaging/0005-Fedora-HACK-use-custom-older-xdelta.patch b/packaging/0005-Fedora-HACK-use-custom-older-xdelta.patch
index 407d7d543f0ec8eb6ebb02a3cccff84df78f50b3..5915c230b0ba237197e5952212f1ca24fa248930 100644 (file)
--- a/packaging/0005-Fedora-HACK-use-custom-older-xdelta.patch
+++ b/packaging/0005-Fedora-HACK-use-custom-older-xdelta.patch
@@ -2,8 +2,10 @@ From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
 Date: Mon, 3 Sep 2012 15:21:43 +0300
 Subject: Fedora HACK: use custom (older) xdelta
 
-Gbp-Rpm-If: 0%{?fedora}
+Gbp-Rpm: If 0%{?fedora}
+Gbp: Ignore
 
+Change-Id: Id0658bbc428034aeb38d61cf0245909c38845534
 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
 ---
  pristine-gz  |    4 ++--

diff --git a/packaging/0006-Add-.gbp.conf.patch b/packaging/0006-Add-.gbp.conf.patch
new file mode 100644 (file)
index 0000000..521c817
--- /dev/null
+++ b/packaging/0006-Add-.gbp.conf.patch
@@ -0,0 +1,22 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Mon, 13 May 2013 10:36:39 +0300
+Subject: Add .gbp.conf
+
+Needed for gbp-pq-rpm tool.
+
+Change-Id: Idb1677653b08de7763ccaf7fe001267c06ff3109
+Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+---
+ .gbp.conf |    3 +++
+ 1 file changed, 3 insertions(+)
+ create mode 100644 .gbp.conf
+
+diff --git a/.gbp.conf b/.gbp.conf
+new file mode 100644
+index 0000000..666174f
+--- /dev/null
++++ b/.gbp.conf
+@@ -0,0 +1,3 @@
++[gbp-pq-rpm]
++upstream-tag = %(upstreamversion)s
++packaging-dir = packaging

diff --git a/packaging/pristine-tar.spec b/packaging/pristine-tar.spec
index eeb7a54443efe880bffd71fef81826cf04044c9a..b3691910e16376b1c11fe187e3ad6d148a52ed50 100644 (file)
--- a/packaging/pristine-tar.spec
+++ b/packaging/pristine-tar.spec
@@ -12,6 +12,7 @@ Patch1:     0002-openSUSE-HACK-add-upstream-bzip2-v1.0.6-sources.patch
 Patch2:     0003-openSUSE-HACK-modify-Makefile-in-upstream-bzip2.patch
 Patch3:     0004-openSUSE-HACK-enable-special-upstream-bzip2.patch
 Patch4:     0005-Fedora-HACK-use-custom-older-xdelta.patch
+Patch5:     0006-Add-.gbp.conf.patch
 Requires:   gzip
 Requires:   bzip2
 %if 0%{?suse_version} >= 1210
@@ -79,6 +80,8 @@ control.
 %if 0%{?fedora}
 %patch4 -p1
 %endif
+# 0006-Add-.gbp.conf.patch
+%patch5 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor PREFIX=%{_prefix}