diff --git a/qwt5-qt5.spec b/qwt5-qt5.spec index 7ceca0e..a411134 100644 --- a/qwt5-qt5.spec +++ b/qwt5-qt5.spec @@ -4,20 +4,24 @@ # This fork contains several bugfixes and configuration file patches, to comply # with distribution-specific system paths. -%global commit0 0052f96fdd6d5f021f20a1cfc4d2fcfc605941da +# Force out of source build +%undefine __cmake_in_source_build + +%global commit0 acd8dbb0c373154c664e23cae7ccd70f7d0f2651 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global commitdate 20200902 +%global commitdate 20210114 %global owner gbm19 Name: qwt5-qt5 Version: 5.2.3a -Release: 8.%{commitdate}git%{shortcommit0}%{?dist} +Release: 9.%{commitdate}git%{shortcommit0}%{?dist} Summary: Qt Widgets for Technical Applications adapted to Qt5 License: LGPLv2+ with exceptions URL: https://github.com/gbm19/qwt5-qt5 Source: https://github.com/%{owner}/%{name}/archive/master/%{name}-master.tar.gz +BuildRequires: cmake BuildRequires: make BuildRequires: gcc-c++ BuildRequires: pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets) pkgconfig(Qt5PrintSupport) @@ -57,13 +61,13 @@ for f in doc/man/man3/*.3; do mv $f ${f/%.3/.qt5.3}; done %build pushd %{name}-master -%{qmake_qt5} -%make_build +%cmake . +%cmake_build %install pushd %{name}-master -make install INSTALL_ROOT=%{buildroot} +%cmake_install %ldconfig_scriptlets @@ -87,6 +91,10 @@ make install INSTALL_ROOT=%{buildroot} %changelog +* Fri May 07 2021 Alexander Ploumistos - 5.2.3a-9.20210114gitacd8dbb +- Update to snapshot acd8dbb +- Switch to cmake + * Wed Jan 27 2021 Fedora Release Engineering - 5.2.3a-8.20200902git0052f96 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 3b75730..bb2de16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qwt5-qt5-master.tar.gz) = 8d8009ad146fd0136d9742d71588549ac37559b5cc727a9b483ee8d98690c486d65f7abe0d7228285ee8ce6072acb7f38e0d7b1458460a02ebc714b38a16e564 +SHA512 (qwt5-qt5-master.tar.gz) = 7854c2e425a16e30321ecf8c5fc5a563e81c77a15ab61a0dc143f3b7a2549c9191c24b0aca68cb02d24a1fb4a41a078820bcbeb7d64043b4a6cd8d9c6b91af4a