rpm: Fix tags in rpm spec files

Patches are named similar to sources, counting from 0.

https://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch09s03s04.html

diff --git a/tests/20_test_rpm.py b/tests/20_test_rpm.py
index a2cd5e01f223a04099a765557a81f3daf57d848d..c261c4523ab8be92a975ec938fd2b28a91ccf1fa 100644 (file)
--- a/tests/20_test_rpm.py
+++ b/tests/20_test_rpm.py
@@ -231,7 +231,7 @@ class TestSpecFile(RpmTestBase):
         spec.protected('_delete_tag')('source', 0)
         eq_(spec.sources(), {})
         spec.protected('_delete_tag')('patch', 0)
-        spec.protected('_delete_tag')('patch', -1)
+        spec.protected('_delete_tag')('patch', 1)
         eq_(spec.protected('_patches')(), {})
         prev = spec.protected('_delete_tag')('invalidtag', None)
 
@@ -314,7 +314,7 @@ class TestSpecFile(RpmTestBase):
             for patch in spec.protected('_tags')['patch']['lines']:
                 patches[patch['num']] = patch['linevalue']
 
-            eq_(patches, {0: 'my_patch0', -1: 'my_patch'})
+            eq_(patches, {0: 'my_patch0', 1: 'my_patch'})
 
     def test_patch_series(self):
         """Test the getting the patches as a patchseries"""

diff --git a/tests/data/rpm/specs/gbp-test-tags.spec b/tests/data/rpm/specs/gbp-test-tags.spec
index d0f2e9e30a49760176b890494ab7ac0074710433..19efe9f0d75b796a3427063cd1f41e7fe1166997 100644 (file)
--- a/tests/data/rpm/specs/gbp-test-tags.spec
+++ b/tests/data/rpm/specs/gbp-test-tags.spec
@@ -33,7 +33,7 @@ Packager:       my_packager
 Url:            my_url
 Vcs:            my_vcs
 Source:         my_source
-Patch:          my_%patch_fn_base
+Patch1:         my_%patch_fn_base
 Patch0:         my_%{patch_fn_base}0
 Nosource:       0
 Nopatch:        0

diff --git a/tests/data/rpm/specs/gbp-test-updates.spec b/tests/data/rpm/specs/gbp-test-updates.spec
index e68f4b2df0c4447fb30562fe8c62cc99c9ad5cae..30ccb30d0cb9fc39061524db9926c84929c371ef 100644 (file)
--- a/tests/data/rpm/specs/gbp-test-updates.spec
+++ b/tests/data/rpm/specs/gbp-test-updates.spec
@@ -17,7 +17,7 @@ Packager:       my_packager
 Url:            my_url
 Vcs:            my_vcs
 Source:         my_source
-Patch:          my_%patch_fn_base
+Patch1:         my_%patch_fn_base
 Patch0:         my_%{patch_fn_base}0
 Nosource:       0
 Nopatch:        0