Fix packaging more for promotions.

[packaging] Fix more promotion issues. Contributes to JB#36248. Make .spec contain all required files except .spec files because promotion does not count those files as source files. Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
sailfishos · Sep 14, 2016 · 40df565 · 40df565
1 parent 77c0146
commit 40df565
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 180 deletions.
diff --git a/precheckin.sh b/precheckin.sh
@@ -2,7 +2,5 @@
 ARCHS="armv6l armv7l armv7hl armv7thl armv7tnhl mipsel aarch64 i486"
 
 for x in $ARCHS; do
-	cp -v sb2-tools-template-rpmlintrc sb2-tools-$x-rpmlintrc
 	sed "s/@ARCH@/$x/g" sb2-tools-template.spec > sb2-tools-$x.spec
-	sed -i "s/Source2..: sb2-tools-$x\.spec//g" sb2-tools-$x.spec
 done
diff --git a/sb2-tools-aarch64-rpmlintrc b/sb2-tools-aarch64-rpmlintrc
diff --git a/sb2-tools-aarch64.spec b/sb2-tools-aarch64.spec
@@ -4,7 +4,7 @@
 %define _target_cpu aarch64
 
 Name:          sb2-tools-aarch64-inject
-Version:       1.0+git2
+Version:       1.0+git3
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -15,23 +15,6 @@ BuildRequires: %cross_compilers
 # we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
 Source101: precheckin.sh
 Source200: sb2-tools-template-rpmlintrc
-Source201: sb2-tools-template.spec 
-Source202: sb2-tools-armv6l-rpmlintrc
-Source203: sb2-tools-armv6l.spec 
-Source204: sb2-tools-armv7l-rpmlintrc
-Source205: sb2-tools-armv7l.spec 
-Source206: sb2-tools-armv7hl-rpmlintrc
-Source207: sb2-tools-armv7hl.spec 
-Source208: sb2-tools-armv7thl-rpmlintrc
-Source209: sb2-tools-armv7thl.spec 
-Source210: sb2-tools-armv7tnhl-rpmlintrc
-Source211: sb2-tools-armv7tnhl.spec 
-Source212: sb2-tools-mipsel-rpmlintrc
-Source213: sb2-tools-mipsel.spec 
-Source214: sb2-tools-aarch64-rpmlintrc
-
-Source216: sb2-tools-i486-rpmlintrc
-Source217: sb2-tools-i486.spec 
 # no auto requirements - they're generated
 License:       BSD
 Group:         Development/Tools

diff --git a/sb2-tools-armv6l-rpmlintrc b/sb2-tools-armv6l-rpmlintrc
diff --git a/sb2-tools-armv6l.spec b/sb2-tools-armv6l.spec
@@ -4,7 +4,7 @@
 %define _target_cpu armv6l
 
 Name:          sb2-tools-armv6l-inject
-Version:       1.0+git2
+Version:       1.0+git3
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -15,23 +15,6 @@ BuildRequires: %cross_compilers
 # we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
 Source101: precheckin.sh
 Source200: sb2-tools-template-rpmlintrc
-Source201: sb2-tools-template.spec 
-Source202: sb2-tools-armv6l-rpmlintrc
-
-Source204: sb2-tools-armv7l-rpmlintrc
-Source205: sb2-tools-armv7l.spec 
-Source206: sb2-tools-armv7hl-rpmlintrc
-Source207: sb2-tools-armv7hl.spec 
-Source208: sb2-tools-armv7thl-rpmlintrc
-Source209: sb2-tools-armv7thl.spec 
-Source210: sb2-tools-armv7tnhl-rpmlintrc
-Source211: sb2-tools-armv7tnhl.spec 
-Source212: sb2-tools-mipsel-rpmlintrc
-Source213: sb2-tools-mipsel.spec 
-Source214: sb2-tools-aarch64-rpmlintrc
-Source215: sb2-tools-aarch64.spec 
-Source216: sb2-tools-i486-rpmlintrc
-Source217: sb2-tools-i486.spec 
 # no auto requirements - they're generated
 License:       BSD
 Group:         Development/Tools

diff --git a/sb2-tools-armv7hl-rpmlintrc b/sb2-tools-armv7hl-rpmlintrc
diff --git a/sb2-tools-armv7hl.spec b/sb2-tools-armv7hl.spec
@@ -4,7 +4,7 @@
 %define _target_cpu armv7hl
 
 Name:          sb2-tools-armv7hl-inject
-Version:       1.0+git2
+Version:       1.0+git3
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -15,23 +15,6 @@ BuildRequires: %cross_compilers
 # we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
 Source101: precheckin.sh
 Source200: sb2-tools-template-rpmlintrc
-Source201: sb2-tools-template.spec 
-Source202: sb2-tools-armv6l-rpmlintrc
-Source203: sb2-tools-armv6l.spec 
-Source204: sb2-tools-armv7l-rpmlintrc
-Source205: sb2-tools-armv7l.spec 
-Source206: sb2-tools-armv7hl-rpmlintrc
-
-Source208: sb2-tools-armv7thl-rpmlintrc
-Source209: sb2-tools-armv7thl.spec 
-Source210: sb2-tools-armv7tnhl-rpmlintrc
-Source211: sb2-tools-armv7tnhl.spec 
-Source212: sb2-tools-mipsel-rpmlintrc
-Source213: sb2-tools-mipsel.spec 
-Source214: sb2-tools-aarch64-rpmlintrc
-Source215: sb2-tools-aarch64.spec 
-Source216: sb2-tools-i486-rpmlintrc
-Source217: sb2-tools-i486.spec 
 # no auto requirements - they're generated
 License:       BSD
 Group:         Development/Tools

diff --git a/sb2-tools-armv7l-rpmlintrc b/sb2-tools-armv7l-rpmlintrc
diff --git a/sb2-tools-armv7l.spec b/sb2-tools-armv7l.spec
@@ -4,7 +4,7 @@
 %define _target_cpu armv7l
 
 Name:          sb2-tools-armv7l-inject
-Version:       1.0+git2
+Version:       1.0+git3
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -15,23 +15,6 @@ BuildRequires: %cross_compilers
 # we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
 Source101: precheckin.sh
 Source200: sb2-tools-template-rpmlintrc
-Source201: sb2-tools-template.spec 
-Source202: sb2-tools-armv6l-rpmlintrc
-Source203: sb2-tools-armv6l.spec 
-Source204: sb2-tools-armv7l-rpmlintrc
-
-Source206: sb2-tools-armv7hl-rpmlintrc
-Source207: sb2-tools-armv7hl.spec 
-Source208: sb2-tools-armv7thl-rpmlintrc
-Source209: sb2-tools-armv7thl.spec 
-Source210: sb2-tools-armv7tnhl-rpmlintrc
-Source211: sb2-tools-armv7tnhl.spec 
-Source212: sb2-tools-mipsel-rpmlintrc
-Source213: sb2-tools-mipsel.spec 
-Source214: sb2-tools-aarch64-rpmlintrc
-Source215: sb2-tools-aarch64.spec 
-Source216: sb2-tools-i486-rpmlintrc
-Source217: sb2-tools-i486.spec 
 # no auto requirements - they're generated
 License:       BSD
 Group:         Development/Tools

diff --git a/sb2-tools-armv7thl-rpmlintrc b/sb2-tools-armv7thl-rpmlintrc
diff --git a/sb2-tools-armv7thl.spec b/sb2-tools-armv7thl.spec
@@ -4,7 +4,7 @@
 %define _target_cpu armv7thl
 
 Name:          sb2-tools-armv7thl-inject
-Version:       1.0+git2
+Version:       1.0+git3
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -15,23 +15,6 @@ BuildRequires: %cross_compilers
 # we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
 Source101: precheckin.sh
 Source200: sb2-tools-template-rpmlintrc
-Source201: sb2-tools-template.spec 
-Source202: sb2-tools-armv6l-rpmlintrc
-Source203: sb2-tools-armv6l.spec 
-Source204: sb2-tools-armv7l-rpmlintrc
-Source205: sb2-tools-armv7l.spec 
-Source206: sb2-tools-armv7hl-rpmlintrc
-Source207: sb2-tools-armv7hl.spec 
-Source208: sb2-tools-armv7thl-rpmlintrc
-
-Source210: sb2-tools-armv7tnhl-rpmlintrc
-Source211: sb2-tools-armv7tnhl.spec 
-Source212: sb2-tools-mipsel-rpmlintrc
-Source213: sb2-tools-mipsel.spec 
-Source214: sb2-tools-aarch64-rpmlintrc
-Source215: sb2-tools-aarch64.spec 
-Source216: sb2-tools-i486-rpmlintrc
-Source217: sb2-tools-i486.spec 
 # no auto requirements - they're generated
 License:       BSD
 Group:         Development/Tools

diff --git a/sb2-tools-armv7tnhl-rpmlintrc b/sb2-tools-armv7tnhl-rpmlintrc
diff --git a/sb2-tools-armv7tnhl.spec b/sb2-tools-armv7tnhl.spec
@@ -4,7 +4,7 @@
 %define _target_cpu armv7tnhl
 
 Name:          sb2-tools-armv7tnhl-inject
-Version:       1.0+git2
+Version:       1.0+git3
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -15,23 +15,6 @@ BuildRequires: %cross_compilers
 # we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
 Source101: precheckin.sh
 Source200: sb2-tools-template-rpmlintrc
-Source201: sb2-tools-template.spec 
-Source202: sb2-tools-armv6l-rpmlintrc
-Source203: sb2-tools-armv6l.spec 
-Source204: sb2-tools-armv7l-rpmlintrc
-Source205: sb2-tools-armv7l.spec 
-Source206: sb2-tools-armv7hl-rpmlintrc
-Source207: sb2-tools-armv7hl.spec 
-Source208: sb2-tools-armv7thl-rpmlintrc
-Source209: sb2-tools-armv7thl.spec 
-Source210: sb2-tools-armv7tnhl-rpmlintrc
-
-Source212: sb2-tools-mipsel-rpmlintrc
-Source213: sb2-tools-mipsel.spec 
-Source214: sb2-tools-aarch64-rpmlintrc
-Source215: sb2-tools-aarch64.spec 
-Source216: sb2-tools-i486-rpmlintrc
-Source217: sb2-tools-i486.spec 
 # no auto requirements - they're generated
 License:       BSD
 Group:         Development/Tools

diff --git a/sb2-tools-i486-rpmlintrc b/sb2-tools-i486-rpmlintrc
diff --git a/sb2-tools-i486.spec b/sb2-tools-i486.spec
@@ -4,7 +4,7 @@
 %define _target_cpu i486
 
 Name:          sb2-tools-i486-inject
-Version:       1.0+git2
+Version:       1.0+git3
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -15,23 +15,6 @@ BuildRequires: %cross_compilers
 # we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
 Source101: precheckin.sh
 Source200: sb2-tools-template-rpmlintrc
-Source201: sb2-tools-template.spec 
-Source202: sb2-tools-armv6l-rpmlintrc
-Source203: sb2-tools-armv6l.spec 
-Source204: sb2-tools-armv7l-rpmlintrc
-Source205: sb2-tools-armv7l.spec 
-Source206: sb2-tools-armv7hl-rpmlintrc
-Source207: sb2-tools-armv7hl.spec 
-Source208: sb2-tools-armv7thl-rpmlintrc
-Source209: sb2-tools-armv7thl.spec 
-Source210: sb2-tools-armv7tnhl-rpmlintrc
-Source211: sb2-tools-armv7tnhl.spec 
-Source212: sb2-tools-mipsel-rpmlintrc
-Source213: sb2-tools-mipsel.spec 
-Source214: sb2-tools-aarch64-rpmlintrc
-Source215: sb2-tools-aarch64.spec 
-Source216: sb2-tools-i486-rpmlintrc
-
 # no auto requirements - they're generated
 License:       BSD
 Group:         Development/Tools

diff --git a/sb2-tools-mipsel-rpmlintrc b/sb2-tools-mipsel-rpmlintrc
diff --git a/sb2-tools-mipsel.spec b/sb2-tools-mipsel.spec
@@ -4,7 +4,7 @@
 %define _target_cpu mipsel
 
 Name:          sb2-tools-mipsel-inject
-Version:       1.0+git2
+Version:       1.0+git3
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -15,23 +15,6 @@ BuildRequires: %cross_compilers
 # we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
 Source101: precheckin.sh
 Source200: sb2-tools-template-rpmlintrc
-Source201: sb2-tools-template.spec 
-Source202: sb2-tools-armv6l-rpmlintrc
-Source203: sb2-tools-armv6l.spec 
-Source204: sb2-tools-armv7l-rpmlintrc
-Source205: sb2-tools-armv7l.spec 
-Source206: sb2-tools-armv7hl-rpmlintrc
-Source207: sb2-tools-armv7hl.spec 
-Source208: sb2-tools-armv7thl-rpmlintrc
-Source209: sb2-tools-armv7thl.spec 
-Source210: sb2-tools-armv7tnhl-rpmlintrc
-Source211: sb2-tools-armv7tnhl.spec 
-Source212: sb2-tools-mipsel-rpmlintrc
-
-Source214: sb2-tools-aarch64-rpmlintrc
-Source215: sb2-tools-aarch64.spec 
-Source216: sb2-tools-i486-rpmlintrc
-Source217: sb2-tools-i486.spec 
 # no auto requirements - they're generated
 License:       BSD
 Group:         Development/Tools

diff --git a/sb2-tools-template.changes b/sb2-tools-template.changes
@@ -1,3 +1,6 @@
+* Wed Sep 14 2016 Matti Kosola <matti.kosola@jolla.com> - 1.0+git3
+- Still some changes to get promotions work. Contributes to JB#36248
+
 * Mon Sep 12 2016 Marko Saukko <marko.saukko@jolla.com> - 1.0+git2
 - Make the promotions work. Contributes to JB#36248
 

diff --git a/sb2-tools-template.spec b/sb2-tools-template.spec
@@ -4,7 +4,7 @@
 %define _target_cpu @ARCH@
 
 Name:          sb2-tools-@ARCH@-inject
-Version:       1.0+git2
+Version:       1.0+git3
 Release:       1
 AutoReqProv:   0
 BuildRequires: rpm grep tar patchelf sed
@@ -15,23 +15,6 @@ BuildRequires: %cross_compilers
 # we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
 Source101: precheckin.sh
 Source200: sb2-tools-template-rpmlintrc
-Source201: sb2-tools-template.spec 
-Source202: sb2-tools-armv6l-rpmlintrc
-Source203: sb2-tools-armv6l.spec 
-Source204: sb2-tools-armv7l-rpmlintrc
-Source205: sb2-tools-armv7l.spec 
-Source206: sb2-tools-armv7hl-rpmlintrc
-Source207: sb2-tools-armv7hl.spec 
-Source208: sb2-tools-armv7thl-rpmlintrc
-Source209: sb2-tools-armv7thl.spec 
-Source210: sb2-tools-armv7tnhl-rpmlintrc
-Source211: sb2-tools-armv7tnhl.spec 
-Source212: sb2-tools-mipsel-rpmlintrc
-Source213: sb2-tools-mipsel.spec 
-Source214: sb2-tools-aarch64-rpmlintrc
-Source215: sb2-tools-aarch64.spec 
-Source216: sb2-tools-i486-rpmlintrc
-Source217: sb2-tools-i486.spec 
 # no auto requirements - they're generated
 License:       BSD
 Group:         Development/Tools