[qtox] Improve compatibility with new CMake macro
by Leigh Scott
commit 669d7c7088a557b1eb3135ee3e78f14ba35cf657
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Aug 18 21:16:48 2020 +0100
Improve compatibility with new CMake macro
qtox.spec | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/qtox.spec b/qtox.spec
index f71b65a..31ca2d2 100644
--- a/qtox.spec
+++ b/qtox.spec
@@ -4,6 +4,8 @@
# git describe
%global qtox_version v1.16.3-704-gedb6af6f
+%undefine __cmake_in_source_build
+
Name: qtox
Version: 1.16.3
Release: 5.%{snapshotdate}git%{shortcommit}%{?dist}
@@ -23,7 +25,7 @@ Patch0: qTox-af02542-remove_project_group.patch
Patch1: qTox-af02542-disable_Werror.patch
BuildRequires: gcc-c++
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: pkgconfig(Qt5)
@@ -56,19 +58,16 @@ guidelines while running on all major platforms.
%autosetup -p1 -n qTox-%{commit}
%build
-mkdir build && cd build
-%cmake -DSVGZ_ICON=OFF \
+%cmake3 -DSVGZ_ICON=OFF \
-DGIT_DESCRIBE=%{qtox_version} \
- -DGIT_VERSION=%{commit} \
- ..
-%make_build
+ -DGIT_VERSION=%{commit}
+%cmake3_build
%install
-cd build
-%make_install
+%cmake3_install
%check
-cd build
+cd %{_vpath_builddir}
ctest -V %{?_smp_mflags} ||:
desktop-file-validate %{buildroot}%{_datadir}/applications/io.github.qtox.qTox.desktop
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/io.github.qtox.qTox.appdata.xml
4 years, 3 months
[rtmpdump] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
by Leigh Scott
commit 4ea3985eec5dac0be114dd4312924e1f4cdc55c8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Aug 18 20:47:29 2020 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Leigh Scott <leigh123linux(a)gmail.com>
rtmpdump.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/rtmpdump.spec b/rtmpdump.spec
index 353cc6e..8f2eaf6 100644
--- a/rtmpdump.spec
+++ b/rtmpdump.spec
@@ -4,7 +4,7 @@
Name: rtmpdump
Version: 2.4
-Release: 17.%{gitdate}.git%{shortcommit}%{?dist}
+Release: 18.%{gitdate}.git%{shortcommit}%{?dist}
Summary: Toolkit for RTMP streams
# The tools are GPLv2+. The library is LGPLv2+, see below.
@@ -77,6 +77,9 @@ rm -f %{buildroot}%{_libdir}/librtmp.a
%{_mandir}/man3/librtmp.3*
%changelog
+* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.4-18.20190330.gitc5f04a5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Thu Mar 12 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.4-17.20190330.gitc5f04a5
- Rebuilt for i686
4 years, 3 months
[rfpkgdb-cli] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
by Leigh Scott
commit eefc179f3dbbf0dc4bc6fd44b9757597d2c2391b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Aug 18 20:47:13 2020 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Leigh Scott <leigh123linux(a)gmail.com>
rfpkgdb-cli.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/rfpkgdb-cli.spec b/rfpkgdb-cli.spec
index 44f3384..3f08e87 100644
--- a/rfpkgdb-cli.spec
+++ b/rfpkgdb-cli.spec
@@ -1,6 +1,6 @@
Name: rfpkgdb-cli
Version: 2.15.0
-Release: 0.5rc2%{?dist}
+Release: 0.6rc2%{?dist}
Summary: A CLI for pkgdb
License: GPLv2+
@@ -55,6 +55,9 @@ It also allows you to orphan and/or retire your package(s).
%changelog
+* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.15.0-0.6rc2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Sat May 30 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.15.0-0.5rc2
- Rebuild for python-3.9
4 years, 3 months
[qtox] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
by Leigh Scott
commit 7bc26fb91a46ad0aa82c2091a6d9ff0aedc1a88f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Aug 18 20:46:44 2020 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Leigh Scott <leigh123linux(a)gmail.com>
qtox.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/qtox.spec b/qtox.spec
index 1f109d7..f71b65a 100644
--- a/qtox.spec
+++ b/qtox.spec
@@ -6,7 +6,7 @@
Name: qtox
Version: 1.16.3
-Release: 4.%{snapshotdate}git%{shortcommit}%{?dist}
+Release: 5.%{snapshotdate}git%{shortcommit}%{?dist}
Summary: Feature-rich Tox client
# Main program: GPLv3+
@@ -82,6 +82,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/io.github
%{_datadir}/icons/hicolor/*/apps/qtox.*
%changelog
+* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.16.3-5.20191018gita44cce6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.16.3-4.20191018gita44cce6
- Rebuild for ffmpeg-4.3 git
4 years, 3 months
[qtav] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
by Leigh Scott
commit c96583e72fe862da0bd6b2a1e24efce047386f6b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Aug 18 20:46:31 2020 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Leigh Scott <leigh123linux(a)gmail.com>
qtav.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/qtav.spec b/qtav.spec
index 8afc4ab..f08d0be 100644
--- a/qtav.spec
+++ b/qtav.spec
@@ -3,7 +3,7 @@
Name: qtav
Version: 1.13.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A media playback framework based on Qt and FFmpeg
License: LGPLv2+ and GPLv3+ and BSD
URL: http://www.qtav.org/
@@ -204,6 +204,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/QtAV.svg
%changelog
+* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.13.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Wed Apr 29 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.13.0-5
- Rebuild for QT-5.14
4 years, 3 months
[qt5-qtwebengine-freeworld] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
by Leigh Scott
commit ffa62b0a427c3dc965ff511e40ee41beeb15dc88
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Aug 18 20:46:22 2020 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Leigh Scott <leigh123linux(a)gmail.com>
qt5-qtwebengine-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 03880c8..53babc9 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -47,7 +47,7 @@
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
Version: 5.15.0
-Release: 1%{?dist}
+Release: 2%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -446,6 +446,9 @@ echo "%{_libdir}/%{name}" \
%changelog
+* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 5.15.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Thu Jun 11 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.0-1
- 5.15.0
- f33's icu-67.x currently not compatible, use bundled icu
4 years, 3 months
[qmplay2] Improve compatibility with new CMake macro
by Leigh Scott
commit 3f8f471144cd6f0db6fbbad875808af690cc4ee9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Aug 18 20:44:12 2020 +0100
Improve compatibility with new CMake macro
qmplay2.spec | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/qmplay2.spec b/qmplay2.spec
index f026fe9..d8ee874 100644
--- a/qmplay2.spec
+++ b/qmplay2.spec
@@ -1,4 +1,5 @@
%undefine _strict_symbol_defs_build
+%undefine __cmake_in_source_build
%global pname QMPlay2
Name: qmplay2
@@ -71,17 +72,14 @@ sed -i '12,33d' src/gui/Unix/QMPlay2.desktop
%build
# Create translation files.
#lrelease-qt5 QMPlay2.pro
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
- %cmake \
+%cmake \
-DCMAKE_BUILD_TYPE='Debug' \
- -GNinja \
- ..
-popd
-%ninja_build -C %{_target_platform}
+ -GNinja
+
+%cmake3_build
%install
-%ninja_install -C %{_target_platform}
+%cmake3_install
%find_lang %{name} --all-name --with-qt
4 years, 3 months
[qt-heif-image-plugin] Improve compatibility with new CMake macro
by Leigh Scott
commit 13e7b2d08253a4d1a966430a3fa7ec961c6f2a94
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Aug 18 20:27:52 2020 +0100
Improve compatibility with new CMake macro
qt-heif-image-plugin.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/qt-heif-image-plugin.spec b/qt-heif-image-plugin.spec
index 13eaa17..73d1459 100644
--- a/qt-heif-image-plugin.spec
+++ b/qt-heif-image-plugin.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
Name: qt-heif-image-plugin
Version: 0.3.3
Release: 3%{?dist}
@@ -10,7 +12,7 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
# https://github.com/jakar/qt-heif-image-plugin/issues/17
Patch0: qt-heif-image-plugin-fix-libheif-1.7.0.patch
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: cmake(Qt5)
BuildRequires: pkgconfig(libheif) >= 1.1
@@ -25,12 +27,12 @@ BuildRequires: qt5-rpm-macros
%build
-%cmake .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%files
4 years, 3 months