rpm: Fix tags in rpm spec files

diff --git a/tests/data/rpm/rpmbuild/SPECS/gbp-test2.spec b/tests/data/rpm/rpmbuild/SPECS/gbp-test2.spec
index 8a92725d3298427c6927b4da7d92e8506c95fcc2..d5b8763c70e2d922278602b9a29caa27e5d41193 100644 (file)
--- 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 1882131f0c5ab55379a28d79698ef0dca62fd6a0..5e1f176eff452d26cda7b43f424915102b958a83 100644 (file)
--- 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 d41f45037aa180dbe9adffec12f95cc9c4390cc3..32bbe975a5e39f3032d182ee475a42a26cd86d9b 100644 (file)
--- 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 c0c20c8c984cc8cfc9d2e877fe0797b053cca158..043afec0d2abe827957f3648a0c517462af22aba 100644 (file)
--- 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