diff options
| author | Jochen Sprickerhof <jspricke@debian.org> | 2021-01-31 22:40:00 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2021-02-01 09:00:29 +0100 |
| commit | 8b3abc9b4805c861d81acb5c25f1084b9ae11ebe (patch) | |
| tree | 01d13f8e2a97fb042b35345f56e904be44b3b036 /tests | |
| parent | 99af76a14237bba5ba391d2046b7ac1111fa4f23 (diff) | |
rpm: Fix tags in rpm spec files
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/rpm/rpmbuild/SPECS/gbp-test2.spec | 6 | ||||
| -rw-r--r-- | tests/data/rpm/specs/gbp-test2-reference.spec | 11 | ||||
| -rw-r--r-- | tests/data/rpm/specs/gbp-test2-reference2.spec | 15 | ||||
| -rw-r--r-- | tests/data/rpm/specs/gbp-test3.spec | 2 |
4 files changed, 16 insertions, 18 deletions
diff --git a/tests/data/rpm/rpmbuild/SPECS/gbp-test2.spec b/tests/data/rpm/rpmbuild/SPECS/gbp-test2.spec index 8a92725d..d5b8763c 100644 --- a/tests/data/rpm/rpmbuild/SPECS/gbp-test2.spec +++ b/tests/data/rpm/rpmbuild/SPECS/gbp-test2.spec @@ -6,10 +6,10 @@ Release: 0 Group: Development/Libraries License: GPLv2 Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz -Source: foo.txt +Source0: foo.txt Source20: bar.tar.gz -# Gbp-Ignore-Patches: -1 -Patch: my.patch +# Gbp-Ignore-Patches: 0 +Patch0: my.patch Patch10: my2.patch Patch20: my3.patch Packager: Markus Lehtonen <markus.lehtonen@linux.intel.com> diff --git a/tests/data/rpm/specs/gbp-test2-reference.spec b/tests/data/rpm/specs/gbp-test2-reference.spec index 1882131f..5e1f176e 100644 --- a/tests/data/rpm/specs/gbp-test2-reference.spec +++ b/tests/data/rpm/specs/gbp-test2-reference.spec @@ -6,12 +6,12 @@ Release: 0 Group: Development/Libraries License: GPLv2 Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz -Source: foo.txt +Source0: foo.txt Source20: bar.tar.gz -# Gbp-Ignore-Patches: -1 -Patch: my.patch +# Gbp-Ignore-Patches: 0 +Patch0: my.patch # Patches auto-generated by git-buildpackage: -Patch0: new.patch +Patch1: new.patch Packager: Markus Lehtonen <markus.lehtonen@linux.intel.com> %description @@ -27,14 +27,13 @@ Empty subpackage for the %{name} test package. %prep %setup -T -n %{name}-%{version} -c -a 10 -%patch echo "Do things" # Gbp-Patch-Macros # new.patch %if 1 -%patch0 -p1 +%patch1 -p1 %endif %build diff --git a/tests/data/rpm/specs/gbp-test2-reference2.spec b/tests/data/rpm/specs/gbp-test2-reference2.spec index d41f4503..32bbe975 100644 --- a/tests/data/rpm/specs/gbp-test2-reference2.spec +++ b/tests/data/rpm/specs/gbp-test2-reference2.spec @@ -6,13 +6,13 @@ Release: 0 Group: Development/Libraries License: GPLv2 Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz -Source: foo.txt +Source0: foo.txt Source20: bar.tar.gz -# Gbp-Ignore-Patches: -1 -Patch: my.patch +# Gbp-Ignore-Patches: 0 +Patch0: my.patch # Patches auto-generated by git-buildpackage: -Patch0: 1.patch -Patch1: 2.patch +Patch1: 1.patch +Patch2: 2.patch Packager: Markus Lehtonen <markus.lehtonen@linux.intel.com> VCS: myvcstag @@ -29,18 +29,17 @@ Empty subpackage for the %{name} test package. %prep %setup -T -n %{name}-%{version} -c -a 10 -%patch echo "Do things" # Gbp-Patch-Macros # 1.patch %if true -%patch0 -p1 +%patch1 -p1 %endif # 2.patch %ifarch %ix86 -%patch1 -p1 +%patch2 -p1 %endif %build diff --git a/tests/data/rpm/specs/gbp-test3.spec b/tests/data/rpm/specs/gbp-test3.spec index c0c20c8c..043afec0 100644 --- a/tests/data/rpm/specs/gbp-test3.spec +++ b/tests/data/rpm/specs/gbp-test3.spec @@ -6,7 +6,7 @@ Group: Development/Libraries License: GPLv2 Source: %{name}-%{version}.tar.gz # Gbp-Ignore-Patches: 10 -Patch: my.patch +Patch0: my.patch Patch10: my2.patch Patch20: my3.patch |