Merge branch 'jb-44870-revert' into 'master'

[packages] Re-introduce qt5-qmake in packages_in_tools, Contributes to JB#45050 See merge request mer-crosshelpers/sb2-tools-qt5!3
sailfishos · Mar 22, 2019 · 1d5cc71 · 1d5cc71
2 parents f03c086 + c85cde5
commit 1d5cc71
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/rpm/sb2-tools-qt5-aarch64.spec b/rpm/sb2-tools-qt5-aarch64.spec
@@ -1,7 +1,7 @@
 %define __strip /bin/true
 %define architecture_target aarch64
 %define _build_name_fmt    %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
-%define packages_in_tools  qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error
+%define packages_in_tools  qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error
 Name:          sb2-tools-qt5-aarch64
 Version:       1.0
 Release:       1

diff --git a/rpm/sb2-tools-qt5-armv7hl.spec b/rpm/sb2-tools-qt5-armv7hl.spec
@@ -1,7 +1,7 @@
 %define __strip /bin/true
 %define architecture_target armv7hl
 %define _build_name_fmt    %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
-%define packages_in_tools  qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error
+%define packages_in_tools  qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error
 Name:          sb2-tools-qt5-armv7hl
 Version:       1.0
 Release:       1

diff --git a/rpm/sb2-tools-qt5-armv7l.spec b/rpm/sb2-tools-qt5-armv7l.spec
@@ -1,7 +1,7 @@
 %define __strip /bin/true
 %define architecture_target armv7l
 %define _build_name_fmt    %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
-%define packages_in_tools  qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error
+%define packages_in_tools  qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error
 Name:          sb2-tools-qt5-armv7l
 Version:       1.0
 Release:       1

diff --git a/rpm/sb2-tools-qt5-mipsel.spec b/rpm/sb2-tools-qt5-mipsel.spec
@@ -1,7 +1,7 @@
 %define __strip /bin/true
 %define architecture_target mipsel
 %define _build_name_fmt    %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
-%define packages_in_tools  qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error
+%define packages_in_tools  qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error
 Name:          sb2-tools-qt5-mipsel
 Version:       1.0
 Release:       1

diff --git a/rpm/sb2-tools-qt5-template.spec b/rpm/sb2-tools-qt5-template.spec
@@ -1,7 +1,7 @@
 %define __strip /bin/true
 %define architecture_target @ARCH@
 %define _build_name_fmt    %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
-%define packages_in_tools  qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error
+%define packages_in_tools  qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error
 Name:          sb2-tools-qt5-@ARCH@
 Version:       1.0
 Release:       1