The package rpms/kf5-kconfig.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/kf5-kconfig.git/commit/?id=586bf6...
https://src.fedoraproject.org/cgit/rpms/kf5-kconfig.git/commit/?id=bad224....
Change:
+%ifnarch s390x
+%ifnarch ppc64 s390x
Thanks.
Full change:
============
commit b8e771446d7615726138fcf0fd8497930243d1a3
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Oct 10 15:39:37 2018 -0500
5.51.0
diff --git a/.gitignore b/.gitignore
index 8f6d7e6..086976e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/kconfig-5.48.0.tar.xz
/kconfig-5.49.0.tar.xz
/kconfig-5.50.0.tar.xz
+/kconfig-5.51.0.tar.xz
diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec
index f2305f8..c0a6fab 100644
--- a/kf5-kconfig.spec
+++ b/kf5-kconfig.spec
@@ -20,8 +20,8 @@
%global ninja 1
Name: kf5-%{framework}
-Version: 5.50.0
-Release: 2%{?dist}
+Version: 5.51.0
+Release: 1%{?dist}
Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system
License: GPLv2+ and LGPLv2+ and MIT
@@ -215,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure
--timeout 300" ||:
%changelog
+* Wed Oct 10 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.51.0-1
+- 5.51.0
+
* Fri Sep 14 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.50.0-2
- disable python on f29+
diff --git a/sources b/sources
index 9fc3609..049f81f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kconfig-5.50.0.tar.xz) =
282a5cefb3cc1752fbfd450732bb3479751d3a20b65661da5ebe1797968f4e20f093b3e1083b232581ed375ab9314f059f13a7f8a1021c1dbb2c96d33fabe746
+SHA512 (kconfig-5.51.0.tar.xz) =
5362d973e9c679206ef5d02f53a781b6b8c7b9c731c04e790b2bd2731ab44f6c49e51bd94287b1a2bedc7abdca84139219155a3b05914888adff7fbe09e02b02
commit abd62d1c91af26e0f4b800a5c4dd39e93147c76b
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Sep 17 08:39:54 2018 -0500
typo
diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec
index c1304cc..f2305f8 100644
--- a/kf5-kconfig.spec
+++ b/kf5-kconfig.spec
@@ -8,7 +8,7 @@
%if 0%{?fedora}
%ifnarch ppc64 s390x
%if 0%{?fedora} < 29
-global python 1
+%global python 1
%endif
%endif
%endif
commit c215adaf93bd3aede2e28a22c2bf34cbb24054c5
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Fri Sep 14 15:47:46 2018 -0500
disable python on f29+
needswork, guessing something to do with sip private modules
diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec
index 7f83d0a..c1304cc 100644
--- a/kf5-kconfig.spec
+++ b/kf5-kconfig.spec
@@ -7,7 +7,9 @@
# FIXME/TODO: sip currently segfaults on s390x
%if 0%{?fedora}
%ifnarch ppc64 s390x
-%global python 1
+%if 0%{?fedora} < 29
+global python 1
+%endif
%endif
%endif
#endif
@@ -19,7 +21,7 @@
Name: kf5-%{framework}
Version: 5.50.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system
License: GPLv2+ and LGPLv2+ and MIT
@@ -57,6 +59,7 @@ BuildRequires: bundled(python2-clang) >= 4.0.1
BuildRequires: python2-clang
%endif
BuildRequires: clang
+BuildRequires: clang-devel
BuildRequires: python2-PyQt5-devel
BuildRequires: python3-PyQt5-devel
%else
@@ -212,6 +215,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure
--timeout 300" ||:
%changelog
+* Fri Sep 14 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.50.0-2
+- disable python on f29+
+
* Tue Sep 04 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.50.0-1
- 5.50
commit 73519fa1fe944bd313ccd397b635bf150d8bb18f
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Sep 12 13:50:54 2018 -0500
make python support fedora-only
diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec
index e625270..7f83d0a 100644
--- a/kf5-kconfig.spec
+++ b/kf5-kconfig.spec
@@ -5,9 +5,11 @@
%if !0%{?bootstrap}
# FIXME/TODO: sip currently segfaults on s390x
+%if 0%{?fedora}
%ifnarch ppc64 s390x
%global python 1
%endif
+%endif
#endif
%global tests 1
%endif
commit 7485230a0865a3a6424d9e7455b07347f4a8d48e
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Sep 4 13:40:15 2018 -0500
5.50
diff --git a/.gitignore b/.gitignore
index 4c7b85d..8f6d7e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/kconfig-5.47.0.tar.xz
/kconfig-5.48.0.tar.xz
/kconfig-5.49.0.tar.xz
+/kconfig-5.50.0.tar.xz
diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec
index 921bf72..e625270 100644
--- a/kf5-kconfig.spec
+++ b/kf5-kconfig.spec
@@ -16,7 +16,7 @@
%global ninja 1
Name: kf5-%{framework}
-Version: 5.49.0
+Version: 5.50.0
Release: 1%{?dist}
Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system
@@ -210,6 +210,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure
--timeout 300" ||:
%changelog
+* Tue Sep 04 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.50.0-1
+- 5.50
+
* Tue Aug 07 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.49.0-1
- 5.49.0
diff --git a/sources b/sources
index a4ccb50..9fc3609 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kconfig-5.49.0.tar.xz) =
7f87fbec203ac22dc31904732d3ca56bc51ca8caabdba0348c57e312280765e76219bd6f31fe30c4b8836c23f825f617a7bd1f069b12e501324f12d6fe86ebaa
+SHA512 (kconfig-5.50.0.tar.xz) =
282a5cefb3cc1752fbfd450732bb3479751d3a20b65661da5ebe1797968f4e20f093b3e1083b232581ed375ab9314f059f13a7f8a1021c1dbb2c96d33fabe746
commit ebf90c2ab7b61a12b16e3764aa72f89fa91893a2
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Aug 7 10:17:19 2018 -0500
5.49.0
diff --git a/.gitignore b/.gitignore
index 0c2b783..4c7b85d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/kconfig-5.46.0.tar.xz
/kconfig-5.47.0.tar.xz
/kconfig-5.48.0.tar.xz
+/kconfig-5.49.0.tar.xz
diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec
index 71a7367..921bf72 100644
--- a/kf5-kconfig.spec
+++ b/kf5-kconfig.spec
@@ -16,8 +16,8 @@
%global ninja 1
Name: kf5-%{framework}
-Version: 5.48.0
-Release: 3%{?dist}
+Version: 5.49.0
+Release: 1%{?dist}
Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system
License: GPLv2+ and LGPLv2+ and MIT
@@ -210,6 +210,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure
--timeout 300" ||:
%changelog
+* Tue Aug 07 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.49.0-1
+- 5.49.0
+
* Wed Aug 01 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.48.0-3
- python: support on f29+ again, add Obsoletes otherwise (like ppc64/s390x) (#1610422)
- macro'ize ninja support
diff --git a/sources b/sources
index d5d3739..a4ccb50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kconfig-5.48.0.tar.xz) =
c1d11fae67114976937d9f30aa3fb8ad3d53e756b792c1b4dcf89f660b77d8150310a06b2e1365bb7f78f46ef6a37280d20657ca8f460d6fc088c9f75efd8ca4
+SHA512 (kconfig-5.49.0.tar.xz) =
7f87fbec203ac22dc31904732d3ca56bc51ca8caabdba0348c57e312280765e76219bd6f31fe30c4b8836c23f825f617a7bd1f069b12e501324f12d6fe86ebaa
commit 0f8712fc304687739ab2b36427bac7a735286a00
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Aug 1 11:14:31 2018 -0500
switch back to ninja
python + make = race'y builds :-/
diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec
index 2628599..71a7367 100644
--- a/kf5-kconfig.spec
+++ b/kf5-kconfig.spec
@@ -13,7 +13,7 @@
%endif
# use ninja instead of make
-#global ninja 1
+%global ninja 1
Name: kf5-%{framework}
Version: 5.48.0
@@ -212,7 +212,7 @@ make test -C %{_target_platform} ARGS="--output-on-failure
--timeout 300" ||:
%changelog
* Wed Aug 01 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.48.0-3
- python: support on f29+ again, add Obsoletes otherwise (like ppc64/s390x) (#1610422)
-- use make again (macro'ize ninja support)
+- macro'ize ninja support
- .spec cosmetics (whitespace mostly)
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.48.0-2
commit bad22409b4452219cb298dc043442da773ab58b1
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Aug 1 10:49:50 2018 -0500
ppc64 sip segfaulting too :(
diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec
index ee1e366..2628599 100644
--- a/kf5-kconfig.spec
+++ b/kf5-kconfig.spec
@@ -5,7 +5,7 @@
%if !0%{?bootstrap}
# FIXME/TODO: sip currently segfaults on s390x
-%ifnarch s390x
+%ifnarch ppc64 s390x
%global python 1
%endif
#endif
@@ -211,7 +211,7 @@ make test -C %{_target_platform} ARGS="--output-on-failure
--timeout 300" ||:
%changelog
* Wed Aug 01 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.48.0-3
-- python: support on f29+ again, add Obsoletes otherwise (like s390x) (#1610422)
+- python: support on f29+ again, add Obsoletes otherwise (like ppc64/s390x) (#1610422)
- use make again (macro'ize ninja support)
- .spec cosmetics (whitespace mostly)
commit b2b44f46df20a9389684bf23224c4beb4cef69d8
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Aug 1 09:29:32 2018 -0500
fix %%check
diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec
index 07f5f77..ee1e366 100644
--- a/kf5-kconfig.spec
+++ b/kf5-kconfig.spec
@@ -164,7 +164,7 @@ xvfb-run -a \
%if 0%{?ninja}
ninja test -v -C %{_target_platform} ||:
%else
-make test ARGS="--output-on-failure --timeout 300"
+make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
%endif
%endif
commit 586bf69389ce80d2901a6bb7e3a53e888b35eed2
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Aug 1 09:22:04 2018 -0500
python: support on f29+ again, add Obsoletes otherwise (like s390x) (#1610422)
use make again (macro'ize ninja support)
.spec cosmetics (whitespace mostly)
diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec
index f74c46b..07f5f77 100644
--- a/kf5-kconfig.spec
+++ b/kf5-kconfig.spec
@@ -4,19 +4,24 @@
#global bootstrap 1
%if !0%{?bootstrap}
-%if 0%{?fedora} && 0%{?fedora} < 28
+# FIXME/TODO: sip currently segfaults on s390x
+%ifnarch s390x
%global python 1
%endif
+#endif
%global tests 1
%endif
-Name: kf5-%{framework}
+# use ninja instead of make
+#global ninja 1
+
+Name: kf5-%{framework}
Version: 5.48.0
-Release: 2%{?dist}
-Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system
+Release: 3%{?dist}
+Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system
-License: GPLv2+ and LGPLv2+ and MIT
-URL:
https://cgit.kde.org/%{framework}.git
+License: GPLv2+ and LGPLv2+ and MIT
+URL:
https://cgit.kde.org/%{framework}.git
%global majmin %(echo %{version} | cut -d. -f1-2)
%global revision %(echo %{version} | cut -d. -f3)
@@ -25,12 +30,15 @@ URL:
https://cgit.kde.org/%{framework}.git
%else
%global stable stable
%endif
-Source0:
http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{ver...
+Source0:
http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{ver...
## upstream patches
## upstreamable patches
+
+%if 0%{?ninja}
BuildRequires: ninja-build
+%endif
BuildRequires: extra-cmake-modules >= %{majmin}
BuildRequires: kf5-rpm-macros >= %{majmin}
@@ -49,6 +57,10 @@ BuildRequires: python2-clang
BuildRequires: clang
BuildRequires: python2-PyQt5-devel
BuildRequires: python3-PyQt5-devel
+%else
+Obsoletes: python2-pykf5-%{framework} < %{version}-%{release}
+Obsoletes: python3-pykf5-%{framework} < %{version}-%{release}
+Obsoletes: pykf5-%{framework}-devel < %{version}-%{release}
%endif
%if 0%{?tests}
@@ -122,17 +134,24 @@ export PYTHONPATH
mkdir %{_target_platform}
pushd %{_target_platform}
-%{cmake_kf5} -G Ninja .. \
+%{cmake_kf5} .. \
+ %{?ninja:-G Ninja} \
%{?tests:-DBUILD_TESTING:BOOL=ON}
popd
-#make_build -C %{_target_platform}
+%if 0%{?ninja}
%ninja_build -C %{_target_platform}
+%else
+%make_build -C %{_target_platform}
+%endif
%install
-#make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%if 0%{?ninja}
%ninja_install -C %{_target_platform}
+%else
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%endif
%find_lang_kf5 kconfig5_qt
@@ -140,12 +159,13 @@ popd
%check
%if 0%{?tests}
export CTEST_OUTPUT_ON_FAILURE=1
+## cant use %%ninja_test here for some reason, doesn't inherit env vars from xvfb or
dbus -- rex
xvfb-run -a \
-dbus-launch --exit-with-session \
+%if 0%{?ninja}
ninja test -v -C %{_target_platform} ||:
-## cant use %%ninja_test here for some reason, doesn't inherit evn vars from xvfb or
dbus -- rex
-
-#make test ARGS="--output-on-failure --timeout 300"
+%else
+make test ARGS="--output-on-failure --timeout 300"
+%endif
%endif
@@ -190,6 +210,11 @@ ninja test -v -C %{_target_platform} ||:
%changelog
+* Wed Aug 01 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.48.0-3
+- python: support on f29+ again, add Obsoletes otherwise (like s390x) (#1610422)
+- use make again (macro'ize ninja support)
+- .spec cosmetics (whitespace mostly)
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.48.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild