diff options
Diffstat (limited to 'gbp-test2.data')
| -rw-r--r-- | gbp-test2.data/Add-dummy-Makefile.patch | 21 | ||||
| -rw-r--r-- | gbp-test2.data/Add-dummy-files.patch | 32 | ||||
| -rw-r--r-- | gbp-test2.data/Add-gbp.conf.patch | 28 | ||||
| -rw-r--r-- | gbp-test2.data/Add-packaging-files.patch | 140 | ||||
| -rw-r--r-- | gbp-test2.data/My-addition.patch | 22 | ||||
| -rw-r--r-- | gbp-test2.data/Remove-imported-patches.patch | 96 | ||||
| -rw-r--r-- | gbp-test2.data/Repository-initialization.patch | 0 | ||||
| -rw-r--r-- | gbp-test2.data/Update-.gbp.conf.patch | 26 | ||||
| -rw-r--r-- | gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names-2.patch | 24 | ||||
| -rw-r--r-- | gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names.patch | 24 | ||||
| -rw-r--r-- | gbp-test2.data/manifest.json | 185 | ||||
| -rw-r--r-- | gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch | 100 | ||||
| -rw-r--r-- | gbp-test2.data/packaging-change-my2.patch-to-git-email-format.patch | 32 | ||||
| -rw-r--r-- | gbp-test2.data/packaging-reflect-the-corrected-patch-number-handling.patch | 42 | ||||
| -rw-r--r-- | gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch | 56 |
15 files changed, 828 insertions, 0 deletions
diff --git a/gbp-test2.data/Add-dummy-Makefile.patch b/gbp-test2.data/Add-dummy-Makefile.patch new file mode 100644 index 0000000..1f9a75b --- /dev/null +++ b/gbp-test2.data/Add-dummy-Makefile.patch @@ -0,0 +1,21 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Wed, 7 Nov 2012 09:13:25 +0200 +Subject: [PATCH] Add dummy Makefile + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + create mode 100644 Makefile + +diff --git a/Makefile b/Makefile +new file mode 100644 +index 0000000..de5341d +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,2 @@ ++all: ++ @echo "Ready (2.0)!" +-- +2.1.4 + diff --git a/gbp-test2.data/Add-dummy-files.patch b/gbp-test2.data/Add-dummy-files.patch new file mode 100644 index 0000000..0b8cd82 --- /dev/null +++ b/gbp-test2.data/Add-dummy-files.patch @@ -0,0 +1,32 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Wed, 7 Nov 2012 09:13:14 +0200 +Subject: [PATCH] Add dummy files + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + README | 2 ++ + dummy.sh | 3 +++ + 2 files changed, 5 insertions(+) + create mode 100644 README + create mode 100755 dummy.sh + +diff --git a/README b/README +new file mode 100644 +index 0000000..1947ce8 +--- /dev/null ++++ b/README +@@ -0,0 +1,2 @@ ++Just for testing git-buildpackage. ++V2.0 +diff --git a/dummy.sh b/dummy.sh +new file mode 100755 +index 0000000..7eeb298 +--- /dev/null ++++ b/dummy.sh +@@ -0,0 +1,3 @@ ++#!/bin/sh ++ ++echo "Hello world 2.0" +-- +2.1.4 + diff --git a/gbp-test2.data/Add-gbp.conf.patch b/gbp-test2.data/Add-gbp.conf.patch new file mode 100644 index 0000000..4e05b98 --- /dev/null +++ b/gbp-test2.data/Add-gbp.conf.patch @@ -0,0 +1,28 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Tue, 13 Nov 2012 13:37:10 +0200 +Subject: [PATCH] Add gbp.conf + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + .gbp.conf | 9 +++++++++ + 1 file changed, 9 insertions(+) + create mode 100644 .gbp.conf + +diff --git a/.gbp.conf b/.gbp.conf +new file mode 100644 +index 0000000..601d792 +--- /dev/null ++++ b/.gbp.conf +@@ -0,0 +1,9 @@ ++[DEFAULT] ++vendor = Test-Distro ++packaging-branch = srcdata/gbp-test2/master ++packaging-tag = srcdata/gbp-test2/release/%(version)s ++upstream-branch = srcdata/gbp-test2/upstream ++upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s ++packaging-dir = packaging ++patch-export-ignore-path = ^(packaging/.*|\.gbp.conf) ++ +-- +2.1.4 + diff --git a/gbp-test2.data/Add-packaging-files.patch b/gbp-test2.data/Add-packaging-files.patch new file mode 100644 index 0000000..3b77369 --- /dev/null +++ b/gbp-test2.data/Add-packaging-files.patch @@ -0,0 +1,140 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Tue, 13 Nov 2012 13:35:52 +0200 +Subject: [PATCH] Add packaging files + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + packaging/bar.tar.gz | Bin 0 -> 177 bytes + packaging/foo.txt | 3 +++ + packaging/gbp-test2.spec | 48 +++++++++++++++++++++++++++++++++++++++++++++++ + packaging/my.patch | 9 +++++++++ + packaging/my2.patch | 7 +++++++ + packaging/my3.patch | 7 +++++++ + 6 files changed, 74 insertions(+) + create mode 100644 packaging/bar.tar.gz + create mode 100644 packaging/foo.txt + create mode 100644 packaging/gbp-test2.spec + create mode 100644 packaging/my.patch + create mode 100644 packaging/my2.patch + create mode 100644 packaging/my3.patch + +diff --git a/packaging/bar.tar.gz b/packaging/bar.tar.gz +new file mode 100644 +index 0000000000000000000000000000000000000000..f5dae8035202d6206a72803f35b756e8fbcb1d6c +GIT binary patch +literal 177 +zcmb2|=3oe$-XFlg{Pvt9Uz34I%foe+M|U?Y3Ej|XZQEqNf@_H&tG8#*a`B^EtqUIh +zSJl^_d?txcZ^=iwt5d!t%uQXNpR?}%&7R7Xtw!E+*RF}oOukZJw%zN?lGS#<^mZvM +z($l+B_5a5uZ71{N3o74k`|Uev%09g%IZa0vb^nX<%+SB|HTQOlhOg$-{%+^@uY+Ir +arH6}VetLbE0U3OFKX1)<rOyl+3=9C`8d6&T + +literal 0 +HcmV?d00001 + +diff --git a/packaging/foo.txt b/packaging/foo.txt +new file mode 100644 +index 0000000..25ed442 +--- /dev/null ++++ b/packaging/foo.txt +@@ -0,0 +1,3 @@ ++FOO: ++ ++file for testing rpm support of git-buildpackage. +diff --git a/packaging/gbp-test2.spec b/packaging/gbp-test2.spec +new file mode 100644 +index 0000000..61aae33 +--- /dev/null ++++ b/packaging/gbp-test2.spec +@@ -0,0 +1,48 @@ ++Name: gbp-test2 ++Summary: Test package 2 for git-buildpackage ++Epoch: 1 ++Version: 2.0 ++Release: 0 ++Group: Development/Libraries ++License: GPLv2 ++Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz ++Source: foo.txt ++Source20: bar.tar.gz ++# Gbp-Ignore-Patches: 0 ++Patch: my.patch ++Patch10: my2.patch ++Patch20: my3.patch ++Packager: Markus Lehtonen <markus.lehtonen@linux.intel.com> ++ ++%description ++Package for testing the RPM functionality of git-buildpackage. ++Version 2 which has packaging and development in the same ++git branch. ++ ++ ++%prep ++%setup -T -n %{name}-%{version} -c -a 10 ++ ++%patch ++%patch -P 10 -p1 ++ ++echo "Do things" ++ ++# Gbp-Patch-Macros ++ ++%build ++make ++ ++ ++%install ++rm -rf %{buildroot} ++mkdir -p %{buildroot}/%{_datadir}/%{name} ++cp -R * %{buildroot}/%{_datadir}/%{name} ++install %{SOURCE0} %{buildroot}/%{_datadir}/%{name} ++ ++ ++ ++%files ++%defattr(-,root,root,-) ++%dir %{_datadir}/%{name} ++%{_datadir}/%{name} +diff --git a/packaging/my.patch b/packaging/my.patch +new file mode 100644 +index 0000000..aa4eb5c +--- /dev/null ++++ b/packaging/my.patch +@@ -0,0 +1,9 @@ ++diff --git a/dummy.sh b/dummy.sh ++index 8c33db6..6f04268 100755 ++--- dummy.sh +++++ dummy.sh ++@@ -1,3 +1,3 @@ ++ #!/bin/sh ++ ++-echo "Hello world 2.0" +++echo "Hello GBP 2.0" +diff --git a/packaging/my2.patch b/packaging/my2.patch +new file mode 100644 +index 0000000..ad5ca2d +--- /dev/null ++++ b/packaging/my2.patch +@@ -0,0 +1,7 @@ ++diff --git a/mydir/myfile.txt b/mydir/myfile.txt ++new file mode 100644 ++index 0000000..2cdad29 ++--- /dev/null +++++ b/mydir/myfile.txt ++@@ -0,0 +1 @@ +++Dummy +diff --git a/packaging/my3.patch b/packaging/my3.patch +new file mode 100644 +index 0000000..9fee859 +--- /dev/null ++++ b/packaging/my3.patch +@@ -0,0 +1,7 @@ ++diff --git a/README b/README ++index a1311cb..a59f1b9 100644 ++--- a/README +++++ b/README ++@@ -1 +1 @@ ++-Just for testing git-buildpackage. +++Just for testing GBP. +-- +2.1.4 + diff --git a/gbp-test2.data/My-addition.patch b/gbp-test2.data/My-addition.patch new file mode 100644 index 0000000..c18d7b2 --- /dev/null +++ b/gbp-test2.data/My-addition.patch @@ -0,0 +1,22 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Tue, 13 Nov 2012 13:55:46 +0200 +Subject: [PATCH] My addition + +Import my2.patch to the git tree. + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + mydir/myfile.txt | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 mydir/myfile.txt + +diff --git a/mydir/myfile.txt b/mydir/myfile.txt +new file mode 100644 +index 0000000..2cdad29 +--- /dev/null ++++ b/mydir/myfile.txt +@@ -0,0 +1 @@ ++Dummy +-- +2.1.4 + diff --git a/gbp-test2.data/Remove-imported-patches.patch b/gbp-test2.data/Remove-imported-patches.patch new file mode 100644 index 0000000..cd91ca0 --- /dev/null +++ b/gbp-test2.data/Remove-imported-patches.patch @@ -0,0 +1,96 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Tue, 13 Nov 2012 13:57:35 +0200 +Subject: [PATCH] Remove imported patches + +And enable automatic patch-generation. + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + .gbp.conf | 1 + + packaging/gbp-test2.spec | 5 +---- + packaging/my2.patch | 16 ---------------- + packaging/my3.patch | 7 ------- + 4 files changed, 2 insertions(+), 27 deletions(-) + delete mode 100644 packaging/my2.patch + delete mode 100644 packaging/my3.patch + +diff --git a/.gbp.conf b/.gbp.conf +index 885f9bb..4af2c49 100644 +--- a/.gbp.conf ++++ b/.gbp.conf +@@ -5,6 +5,7 @@ packaging-tag = srcdata/gbp-test2/release/%(version)s + upstream-branch = srcdata/gbp-test2/upstream + upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s + packaging-dir = packaging ++patch-export = True + patch-export-ignore-path = ^(packaging/.*|\.gbp.conf) + spec-file = packaging/gbp-test2.spec + +diff --git a/packaging/gbp-test2.spec b/packaging/gbp-test2.spec +index 5b41aae..409a102 100644 +--- a/packaging/gbp-test2.spec ++++ b/packaging/gbp-test2.spec +@@ -2,7 +2,7 @@ Name: gbp-test2 + Summary: Test package 2 for git-buildpackage + Epoch: 1 + Version: 2.0 +-Release: 0 ++Release: 1 + Group: Development/Libraries + License: GPLv2 + Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz +@@ -11,8 +11,6 @@ Source20: bar.tar.gz + Source9999: gbp-test2-alt.spec + # Gbp-Ignore-Patches: -1 + Patch: my.patch +-Patch10: http://example.com/patches/my2.patch +-Patch20: my3.patch + Packager: Markus Lehtonen <markus.lehtonen@linux.intel.com> + + %description +@@ -25,7 +23,6 @@ git branch. + %setup -T -n %{name}-%{version} -c -a 10 + + %patch +-%patch -P 10 -p1 + + echo "Do things" + +diff --git a/packaging/my2.patch b/packaging/my2.patch +deleted file mode 100644 +index 5554d9c..0000000 +--- a/packaging/my2.patch ++++ /dev/null +@@ -1,16 +0,0 @@ +-From fb613432f15bc199a724741883b23fff9946b567 Mon Sep 17 00:00:00 2001 +-From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +-Date: Tue, 13 Nov 2012 13:55:46 +0200 +-Subject: [PATCH] My modification +- +-Add new file 'mydir/myfile.txt'. +- +-Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +- +-diff --git a/mydir/myfile.txt b/mydir/myfile.txt +-new file mode 100644 +-index 0000000..2cdad29 +---- /dev/null +-+++ b/mydir/myfile.txt +-@@ -0,0 +1 @@ +-+Dummy +diff --git a/packaging/my3.patch b/packaging/my3.patch +deleted file mode 100644 +index 9fee859..0000000 +--- a/packaging/my3.patch ++++ /dev/null +@@ -1,7 +0,0 @@ +-diff --git a/README b/README +-index a1311cb..a59f1b9 100644 +---- a/README +-+++ b/README +-@@ -1 +1 @@ +--Just for testing git-buildpackage. +-+Just for testing GBP. +-- +2.1.4 + diff --git a/gbp-test2.data/Repository-initialization.patch b/gbp-test2.data/Repository-initialization.patch new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/gbp-test2.data/Repository-initialization.patch diff --git a/gbp-test2.data/Update-.gbp.conf.patch b/gbp-test2.data/Update-.gbp.conf.patch new file mode 100644 index 0000000..08bf437 --- /dev/null +++ b/gbp-test2.data/Update-.gbp.conf.patch @@ -0,0 +1,26 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Thu, 12 Dec 2013 12:15:13 +0200 +Subject: [PATCH] Update .gbp.conf + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + .gbp.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/.gbp.conf b/.gbp.conf +index 885f9bb..c611421 100644 +--- a/.gbp.conf ++++ b/.gbp.conf +@@ -1,7 +1,7 @@ + [DEFAULT] + vendor = Test-Distro +-packaging-branch = srcdata/gbp-test2/master +-packaging-tag = srcdata/gbp-test2/release/%(version)s ++packaging-branch = srcdata/gbp-test2/master-orphan ++packaging-tag = srcdata/gbp-test2/release-orphan/%(version)s + upstream-branch = srcdata/gbp-test2/upstream + upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s + packaging-dir = packaging +-- +2.1.4 + diff --git a/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names-2.patch b/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names-2.patch new file mode 100644 index 0000000..b84ec63 --- /dev/null +++ b/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names-2.patch @@ -0,0 +1,24 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Thu, 26 Feb 2015 11:12:42 +0200 +Subject: [PATCH] gbp.conf: adapt to new patch-export option names + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + .gbp.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.gbp.conf b/.gbp.conf +index 4af2c49..b31adf7 100644 +--- a/.gbp.conf ++++ b/.gbp.conf +@@ -6,6 +6,6 @@ upstream-branch = srcdata/gbp-test2/upstream + upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s + packaging-dir = packaging + patch-export = True +-patch-export-ignore-path = ^(packaging/.*|\.gbp.conf) ++patch-ignore-path = ^(packaging/.*|\.gbp.conf) + spec-file = packaging/gbp-test2.spec + +-- +2.1.4 + diff --git a/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names.patch b/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names.patch new file mode 100644 index 0000000..c8210d1 --- /dev/null +++ b/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names.patch @@ -0,0 +1,24 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Thu, 26 Feb 2015 11:10:16 +0200 +Subject: [PATCH] gbp.conf: adapt to new patch-export option names + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + .gbp.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.gbp.conf b/.gbp.conf +index c611421..eb3aaae 100644 +--- a/.gbp.conf ++++ b/.gbp.conf +@@ -5,6 +5,6 @@ packaging-tag = srcdata/gbp-test2/release-orphan/%(version)s + upstream-branch = srcdata/gbp-test2/upstream + upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s + packaging-dir = packaging +-patch-export-ignore-path = ^(packaging/.*|\.gbp.conf) ++patch-ignore-path = ^(packaging/.*|\.gbp.conf) + spec-file = packaging/gbp-test2.spec + +-- +2.1.4 + diff --git a/gbp-test2.data/manifest.json b/gbp-test2.data/manifest.json new file mode 100644 index 0000000..561fcdd --- /dev/null +++ b/gbp-test2.data/manifest.json @@ -0,0 +1,185 @@ +{ + "commits": { + "9d9a1e4efc5c1a9ba48c7de7bb2f3158a29e40d8": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1424941962 +0200", + "sha1": "9d9a1e4efc5c1a9ba48c7de7bb2f3158a29e40d8", + "patchfile": "gbp.conf-adapt-to-new-patch-export-option-names-2.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1424941962 +0200", + "tree": "d599726243f1b49586c4b6004779aa79d39c42a4", + "parents": [ + "cd2763432f4ad93b29c6f22aee7f623552156a81" + ], + "message": "gbp.conf: adapt to new patch-export option names\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "0579e0753b78476ad822c54b6ea07e2e80c0cdd2": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", + "sha1": "0579e0753b78476ad822c54b6ea07e2e80c0cdd2", + "patchfile": "Repository-initialization.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", + "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904", + "message": "Repository initialization\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "6dd11793b037a9f78473253b85832ab70226e2bc": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300", + "sha1": "6dd11793b037a9f78473253b85832ab70226e2bc", + "patchfile": "Add-gbp.conf.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806630 +0200", + "tree": "aecee30e09c6cb14eea17c622ae65e9a43c6b159", + "parents": [ + "6dccee0ab7689e5ae446d39535138ea39a88e70c" + ], + "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "4515c6e8041903b3aea45d4e424c90f88492fc66": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529986 +0300", + "sha1": "4515c6e8041903b3aea45d4e424c90f88492fc66", + "patchfile": "My-addition.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352807746 +0200", + "tree": "2478f4ee0e07ac1e900bcd9d23f2bb791cd6ede2", + "parents": [ + "3445afd5e168f6a58046b473ff9380999599a374" + ], + "message": "My addition\n\nImport my2.patch to the git tree.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "846aee30702fff8519dcb8bdd591ac1a227859a2": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300", + "sha1": "846aee30702fff8519dcb8bdd591ac1a227859a2", + "patchfile": "packaging-add-alternative-spec-file-and-change-patch-p.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1357733987 +0200", + "tree": "7e4badd5dad4652ad5bb60f772f4296f276b9729", + "parents": [ + "489dbece0462a2818e31b02b3e50d73e003e7a5d" + ], + "message": "packaging: add alternative spec file and change patch path\n\nAdd a second spec file for testing import-srpm spec guessing.\n\nChange one patch filename to be full url for testing import-srpm patch\nimport functionality.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "6dccee0ab7689e5ae446d39535138ea39a88e70c": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806279 +0200", + "sha1": "6dccee0ab7689e5ae446d39535138ea39a88e70c", + "patchfile": "Add-dummy-Makefile.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272405 +0200", + "tree": "afdd4586454b4648d29a606ebf6be9c52708332f", + "parents": [ + "dc4481d39005968f1f2673d760af69b411eccc33" + ], + "message": "Add dummy Makefile\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "97d5c7e811c7b4160142606d1553172ca4567f21": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1424941816 +0200", + "sha1": "97d5c7e811c7b4160142606d1553172ca4567f21", + "patchfile": "gbp.conf-adapt-to-new-patch-export-option-names.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1424941816 +0200", + "tree": "89a8decc2f72f146acc10f4cce68af19dd732b40", + "parents": [ + "33c84e86148c3707d2880f439529074296f03d29" + ], + "message": "gbp.conf: adapt to new patch-export option names\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "3445afd5e168f6a58046b473ff9380999599a374": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300", + "sha1": "3445afd5e168f6a58046b473ff9380999599a374", + "patchfile": "packaging-change-my2.patch-to-git-email-format.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1358253459 +0200", + "tree": "d5c31f1edb05290f70ca4434158aa0dbcac0ddb5", + "parents": [ + "d10f8183822d1a9214d2ec1b98538c1a636d9fb4" + ], + "message": "packaging: change my2.patch to git email format\n\nChange my2.patch from plain diff to git email format to test author and\ndate parsing of gbp.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "489dbece0462a2818e31b02b3e50d73e003e7a5d": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300", + "sha1": "489dbece0462a2818e31b02b3e50d73e003e7a5d", + "patchfile": "Add-packaging-files.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806552 +0200", + "tree": "dc290850829f4818a45a9e968c6159ee28f62074", + "parents": [ + "6dd11793b037a9f78473253b85832ab70226e2bc" + ], + "message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "dc4481d39005968f1f2673d760af69b411eccc33": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806277 +0200", + "sha1": "dc4481d39005968f1f2673d760af69b411eccc33", + "patchfile": "Add-dummy-files.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272394 +0200", + "tree": "af52702a859e84653bfab0a1e0f9253177772f28", + "parents": [ + "0579e0753b78476ad822c54b6ea07e2e80c0cdd2" + ], + "message": "Add dummy files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "cd2763432f4ad93b29c6f22aee7f623552156a81": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377610598 +0300", + "sha1": "cd2763432f4ad93b29c6f22aee7f623552156a81", + "patchfile": "Remove-imported-patches.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352807855 +0200", + "tree": "3ec74b66ae400b34d5dd615f5bfe462b71adcf7f", + "parents": [ + "4515c6e8041903b3aea45d4e424c90f88492fc66" + ], + "message": "Remove imported patches\n\nAnd enable automatic patch-generation.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "33c84e86148c3707d2880f439529074296f03d29": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1386843313 +0200", + "sha1": "33c84e86148c3707d2880f439529074296f03d29", + "patchfile": "Update-.gbp.conf.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1386843313 +0200", + "tree": "058029fd4202f33aa018e0622fef64b9a12aceae", + "parents": [ + "3445afd5e168f6a58046b473ff9380999599a374" + ], + "message": "Update .gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "d10f8183822d1a9214d2ec1b98538c1a636d9fb4": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300", + "sha1": "d10f8183822d1a9214d2ec1b98538c1a636d9fb4", + "patchfile": "packaging-reflect-the-corrected-patch-number-handling.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1357897260 +0200", + "tree": "0506db7aae8d2404ded39db7c1f1a6bea9c81b21", + "parents": [ + "846aee30702fff8519dcb8bdd591ac1a227859a2" + ], + "message": "packaging: reflect the corrected patch number handling\n\nFix spec files as GBP now treats 'Patch:' as patch number -1, instead of\n0.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + }, + "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f": { + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419767 +0300", + "sha1": "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f", + "patchfile": "pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch", + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419767 +0300", + "tree": "aa56ec00b2a895dc32612e9717b525725c40e4a9", + "message": "pristine-tar data for gbp-test2-2.0.tar.gz" + } + }, + "refs": { + "refs/tags/srcdata/gbp-test2/release/1%2.0-1": "c2ab8de23c48dfd24d8ab165279a595d0021cf41", + "refs/tags/srcdata/gbp-test2/release/1%2.0-0": "63a0cbe0ad67d592f838465e595df4688e3f84a5", + "refs/heads/srcdata/gbp-test2/pristine_tar": "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f", + "refs/tags/srcdata/gbp-test2/upstream/2.0": "3006655226cb9f1508a0e5eb1562c5d051170648", + "refs/heads/srcdata/gbp-test2/master": "9d9a1e4efc5c1a9ba48c7de7bb2f3158a29e40d8", + "refs/heads/srcdata/gbp-test2/upstream": "6dccee0ab7689e5ae446d39535138ea39a88e70c", + "refs/heads/srcdata/gbp-test2/master-orphan": "97d5c7e811c7b4160142606d1553172ca4567f21" + }, + "HEAD": "ref: refs/heads/srcdata/gbp-test2/master\n", + "tags": { + "3006655226cb9f1508a0e5eb1562c5d051170648": { + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529719 +0300", + "message": "Version 2.0", + "tag": "srcdata/gbp-test2/upstream/2.0", + "type": "commit", + "object": "6dccee0ab7689e5ae446d39535138ea39a88e70c" + }, + "63a0cbe0ad67d592f838465e595df4688e3f84a5": { + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377530035 +0300", + "message": "Test-Distro release 1:2.0-0", + "tag": "srcdata/gbp-test2/release/1%2.0-0", + "type": "commit", + "object": "3445afd5e168f6a58046b473ff9380999599a374" + }, + "c2ab8de23c48dfd24d8ab165279a595d0021cf41": { + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377610676 +0300", + "message": "Test-Distro release 1:2.0-1", + "tag": "srcdata/gbp-test2/release/1%2.0-1", + "type": "commit", + "object": "cd2763432f4ad93b29c6f22aee7f623552156a81" + } + } +}
\ No newline at end of file diff --git a/gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch b/gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch new file mode 100644 index 0000000..f148df5 --- /dev/null +++ b/gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch @@ -0,0 +1,100 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Wed, 9 Jan 2013 14:19:47 +0200 +Subject: [PATCH] packaging: add alternative spec file and change patch path + +Add a second spec file for testing import-srpm spec guessing. + +Change one patch filename to be full url for testing import-srpm patch +import functionality. + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + .gbp.conf | 1 + + packaging/gbp-test2-alt.spec | 48 ++++++++++++++++++++++++++++++++++++++++++++ + packaging/gbp-test2.spec | 3 ++- + 3 files changed, 51 insertions(+), 1 deletion(-) + create mode 100644 packaging/gbp-test2-alt.spec + +diff --git a/.gbp.conf b/.gbp.conf +index 601d792..885f9bb 100644 +--- a/.gbp.conf ++++ b/.gbp.conf +@@ -6,4 +6,5 @@ upstream-branch = srcdata/gbp-test2/upstream + upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s + packaging-dir = packaging + patch-export-ignore-path = ^(packaging/.*|\.gbp.conf) ++spec-file = packaging/gbp-test2.spec + +diff --git a/packaging/gbp-test2-alt.spec b/packaging/gbp-test2-alt.spec +new file mode 100644 +index 0000000..155ea43 +--- /dev/null ++++ b/packaging/gbp-test2-alt.spec +@@ -0,0 +1,48 @@ ++Name: gbp-test2-alt ++Summary: Test package 2 alternative for git-buildpackage ++Epoch: 1 ++Version: 2.0 ++Release: 0 ++Group: Development/Libraries ++License: GPLv2 ++Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz ++Source: foo.txt ++Source20: bar.tar.gz ++# Gbp-Ignore-Patches: 0 ++Patch: my.patch ++Patch10: http://example.com/patches/my2.patch ++Patch20: my3.patch ++Packager: Markus Lehtonen <markus.lehtonen@linux.intel.com> ++ ++%description ++Package for testing the RPM functionality of git-buildpackage. ++Version 2 which has packaging and development in the same ++git branch. Alternative spec file used. ++ ++ ++%prep ++%setup -T -n %{name}-%{version} -c -a 10 ++ ++%patch ++%patch -P 20 -p1 ++ ++echo "Do things" ++ ++# Gbp-Patch-Macros ++ ++%build ++make ++ ++ ++%install ++rm -rf %{buildroot} ++mkdir -p %{buildroot}/%{_datadir}/%{name} ++cp -R * %{buildroot}/%{_datadir}/%{name} ++install %{SOURCE0} %{buildroot}/%{_datadir}/%{name} ++ ++ ++ ++%files ++%defattr(-,root,root,-) ++%dir %{_datadir}/%{name} ++%{_datadir}/%{name} +diff --git a/packaging/gbp-test2.spec b/packaging/gbp-test2.spec +index 61aae33..eec5d26 100644 +--- a/packaging/gbp-test2.spec ++++ b/packaging/gbp-test2.spec +@@ -8,9 +8,10 @@ License: GPLv2 + Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz + Source: foo.txt + Source20: bar.tar.gz ++Source9999: gbp-test2-alt.spec + # Gbp-Ignore-Patches: 0 + Patch: my.patch +-Patch10: my2.patch ++Patch10: http://example.com/patches/my2.patch + Patch20: my3.patch + Packager: Markus Lehtonen <markus.lehtonen@linux.intel.com> + +-- +2.1.4 + diff --git a/gbp-test2.data/packaging-change-my2.patch-to-git-email-format.patch b/gbp-test2.data/packaging-change-my2.patch-to-git-email-format.patch new file mode 100644 index 0000000..8bab862 --- /dev/null +++ b/gbp-test2.data/packaging-change-my2.patch-to-git-email-format.patch @@ -0,0 +1,32 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Tue, 15 Jan 2013 14:37:39 +0200 +Subject: [PATCH] packaging: change my2.patch to git email format + +Change my2.patch from plain diff to git email format to test author and +date parsing of gbp. + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + packaging/my2.patch | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/packaging/my2.patch b/packaging/my2.patch +index ad5ca2d..5554d9c 100644 +--- a/packaging/my2.patch ++++ b/packaging/my2.patch +@@ -1,3 +1,12 @@ ++From fb613432f15bc199a724741883b23fff9946b567 Mon Sep 17 00:00:00 2001 ++From: Markus Lehtonen <markus.lehtonen@linux.intel.com> ++Date: Tue, 13 Nov 2012 13:55:46 +0200 ++Subject: [PATCH] My modification ++ ++Add new file 'mydir/myfile.txt'. ++ ++Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ++ + diff --git a/mydir/myfile.txt b/mydir/myfile.txt + new file mode 100644 + index 0000000..2cdad29 +-- +2.1.4 + diff --git a/gbp-test2.data/packaging-reflect-the-corrected-patch-number-handling.patch b/gbp-test2.data/packaging-reflect-the-corrected-patch-number-handling.patch new file mode 100644 index 0000000..51639d9 --- /dev/null +++ b/gbp-test2.data/packaging-reflect-the-corrected-patch-number-handling.patch @@ -0,0 +1,42 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Fri, 11 Jan 2013 11:41:00 +0200 +Subject: [PATCH] packaging: reflect the corrected patch number handling + +Fix spec files as GBP now treats 'Patch:' as patch number -1, instead of +0. + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + packaging/gbp-test2-alt.spec | 2 +- + packaging/gbp-test2.spec | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/packaging/gbp-test2-alt.spec b/packaging/gbp-test2-alt.spec +index 155ea43..be5d8bc 100644 +--- a/packaging/gbp-test2-alt.spec ++++ b/packaging/gbp-test2-alt.spec +@@ -8,7 +8,7 @@ License: GPLv2 + Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz + Source: foo.txt + Source20: bar.tar.gz +-# Gbp-Ignore-Patches: 0 ++# Gbp-Ignore-Patches: -1 + Patch: my.patch + Patch10: http://example.com/patches/my2.patch + Patch20: my3.patch +diff --git a/packaging/gbp-test2.spec b/packaging/gbp-test2.spec +index eec5d26..5b41aae 100644 +--- a/packaging/gbp-test2.spec ++++ b/packaging/gbp-test2.spec +@@ -9,7 +9,7 @@ Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz + Source: foo.txt + Source20: bar.tar.gz + Source9999: gbp-test2-alt.spec +-# Gbp-Ignore-Patches: 0 ++# Gbp-Ignore-Patches: -1 + Patch: my.patch + Patch10: http://example.com/patches/my2.patch + Patch20: my3.patch +-- +2.1.4 + diff --git a/gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch b/gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch new file mode 100644 index 0000000..fa6dc96 --- /dev/null +++ b/gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch @@ -0,0 +1,56 @@ +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Tue, 15 Jul 2014 13:22:47 +0300 +Subject: [PATCH] pristine-tar data for gbp-test2-2.0.tar.gz + +--- + gbp-test2-2.0.tar.gz.delta | Bin 0 -> 1302 bytes + gbp-test2-2.0.tar.gz.id | 1 + + 2 files changed, 1 insertion(+) + create mode 100644 gbp-test2-2.0.tar.gz.delta + create mode 100644 gbp-test2-2.0.tar.gz.id + +diff --git a/gbp-test2-2.0.tar.gz.delta b/gbp-test2-2.0.tar.gz.delta +new file mode 100644 +index 0000000000000000000000000000000000000000..94f3aed61c8e4d15c7ba44ca7df329d00facc63f +GIT binary patch +literal 1302 +zcmV+x1?l=9iwFSs0L4=P1MQi6Y*SSn$Il%Dwr*iH0kSy)3xqIvtmnSl#ceP*UI8)z +zqoStXwU@1~T}#`|Z3rump&~FbF^eLP1QT%hh!Z!3@Q4O=3XzvUm~%${KqMP7H4V)5 +zdRkZ*z3ob7Q?l&$N!xpFf4`o`J?DGBIk#E5BB^S=ESY7eD@)IDobF|(<Z#GN6g@CO +z;JCn%5PZZm%OILz1)9N_6+}e7;8_7>R7J55VX1JrB`4|1|E(u@a6<$ZXV}~po18;) +znCEDND2Q3KK_Dj#)@w*q8Zc@KjxyMPf(@MJVUG-W5TdVkHU0EYi~Jpl(D&{KSYU9l +z{#k+OKPDpT)4xq}uBx!q43J0ekOR~+MD;)EjRfRHCzhcRotN5|Y`|!fwC#wd99=lO +z^yhU~C)Olw{jI6M(RAwM3rBW-Q@Vfsj>V_G>Uqz-p>DU?m{*#6_|wDJFaPpWd-k#O +zD^3c!1KEiS^>eScoViw?-#B@D9n+-Ee`ort^o>gw97<Z9*3tH{*z9WPzIf$td)K1O +z?ZOUunQ_6ag|n`{{ejb<Yj4PJO=`I~rt3&=^^Mw&w6#-SxxB{Mtvk@2Gr8N9>sYQ+ +z>gd9^<|dw*=Sy$Pu{HFp>-aLw`K!L<UFF2CJxiYL`bYV`vN`SczDb=MeNQ*OubB2I +z`(}|!_V(&3@|3fwxAQj5eC}WyS9Z?2q<GqQH<S{u<<_N9kAIukYi!)?t6%5a-TbG; +zyY-l|y0<p<cO_x-^KYI{{HsS<d#k9WIq{3>RryMK%j>>+&)r0CZEdg7GUb|*+MPCM +zCv!|mVGsRK@R_D^+m)V<rxLC!Po7rJjnC~odei6KrOfcopRLS0-j;X&92~E%9_c$U +z;~FZ8{rqRC{NG*ekfYniAp9S*BKUtS2<89xJUo>D-xme{AL2w`?P?<VKgL{;{ux1F +z!T)0c89XR;7^C)on^bODDZAX!Yhw`pF9;m?e=G>S|2L2mnl*&k|M!c6{||AZuXZ&N +z{hy^(&;Mu){vQh#OJ(v(i&fSvEu2%ZxKLxRu-U4!T%{o2;ep!!D@n;>FOOmygYbWz +zW5NGpLFoNI<M(ip4zvI77Y*V6ebI+KGT=dozS`A9-v6ug&k8*Fe=J}?r^6bx|C?p2 +zTZ(EMgYbWvgXjM-A+-Nv{|=uP!}x!{DER*nC;Dnv6T$y!7W1nA|1j+TW5U#D3RVz7 +zPYs-;prqiqQ#Lte$t{zMR4iGocBiG}ZqXrC8B45oQZ$wZ{39^Ug8#`anMfXUj3{6- +znPjSYnnxvl7uspJyZvvT$uQY%Ho4rLBbZGlS;kVaDCi9`FUcGym{|kQ@-(ZLCDtJ6 +z^|FXf8eLHD{7s5vN#WooX>v<Kd~lPxJ6#OQWq6US#W1<Ns%nNT&oJqvD;%TB7Z^dE +zkC0~sLL>DvU))l*_oGkt*G)({9lz$_VNVeimz?R4+@{hDv*eZ@tN8Fx&1)CNKJoP* +zV_KW=mPJS7C@LjrRz~~&y_qd**3bTY+>efi##cQ>2o)mq2&G+y&}gdcQG`+{?Q%-1 +zMJSolPCzK0d{V7(EfhjrAkzPpi4a8!2#t^MQ;I?+gho*>O+;v1=&X_cEKkCnwDj<m +zQJ!Q^d>~hAiqvPyGuA@{MpfOncmV(a0000000000000000000000000000000ATp= +MA6fZ-?f_5#06lu0WdHyG + +literal 0 +HcmV?d00001 + +diff --git a/gbp-test2-2.0.tar.gz.id b/gbp-test2-2.0.tar.gz.id +new file mode 100644 +index 0000000..340feea +--- /dev/null ++++ b/gbp-test2-2.0.tar.gz.id +@@ -0,0 +1 @@ ++afdd4586454b4648d29a606ebf6be9c52708332f +-- +2.1.4 + |