From 2442a991a343d33fd19e26ce07c4a2f2c44cf9f3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 21 May 2019 15:44:02 -0500 Subject: [PATCH] cleanup, use %make_build drop Provides: libqaccessibilityclient drop qt5 support (to be packaged separately) --- qaccessibilityclient.spec | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/qaccessibilityclient.spec b/qaccessibilityclient.spec index c7b80c6..41bdbd3 100644 --- a/qaccessibilityclient.spec +++ b/qaccessibilityclient.spec @@ -1,11 +1,8 @@ -## Initial work to support both qt5 builds, but needswork -#global qt5 1 - Name: qaccessibilityclient -Summary: Accessibility client library for Qt +Summary: Accessibility client library for Qt4 Version: 0.1.1 -Release: 14%{?dist} +Release: 15%{?dist} # KDE e.V. may determine that future LGPL versions are accepted License: LGPLv2 or LGPLv3 @@ -36,15 +33,12 @@ Patch13: libqaccessibilityclient-0.1.1-gcc8.patch BuildRequires: cmake >= 2.8.6 BuildRequires: pkgconfig(QtDBus) pkgconfig(QtGui) -Provides: libqaccessibilityclient = %{version}-%{release} - %description %{summary}. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Provides: libqaccessibilityclient-devel = %{version}-%{release} Requires: qt4-devel %description devel %{summary}. @@ -54,7 +48,6 @@ Requires: qt4-devel %autosetup -n libqaccessibilityclient-%{version} -p1 - %build mkdir %{_target_platform} pushd %{_target_platform} @@ -62,23 +55,10 @@ pushd %{_target_platform} -DQT4_BUILD:BOOL=ON popd -make %{?_smp_mflags} -C %{_target_platform} - -%if 0%{?qt5} -mkdir %{_target_platform}-qt5 -pushd %{_target_platform}-qt5 -%{cmake} .. \ - -DQT4_BUILD:BOOL=OFF -popd - -make %{?_smp_mflags} -C %{_target_platform}-qt5 -%endif +%make_build -C %{_target_platform} %install -%if 0%{?qt5} -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt5 -%endif make install/fast DESTDIR=%{buildroot} -C %{_target_platform} ## unpackaged files @@ -101,6 +81,11 @@ rm -f %{buildroot}%{_bindir}/accessibleapps %changelog +* Tue May 21 2019 Rex Dieter - 0.1.1-15 +- cleanup, use %%make_build +- drop Provides: libqaccessibilityclient +- drop qt5 support (to be packaged separately) + * Sat Feb 02 2019 Fedora Release Engineering - 0.1.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild