[unifi/f33] Update to 5.14.22.
by Richard Shaw
Summary of changes:
dcc5f9b... Update to 5.14.22. (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 8 months
[game-data-packager] Use the proper macros
by Leigh Scott
commit 611a9aaea9845aad41298ff17261615562e7e995
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 24 19:05:40 2020 +0100
Use the proper macros
game-data-packager.spec | 72 ++++++++++++++++++++++++++++---------------------
1 file changed, 42 insertions(+), 30 deletions(-)
---
diff --git a/game-data-packager.spec b/game-data-packager.spec
index d9f855b..cdcf2ab 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -19,17 +19,20 @@
Name: game-data-packager
Version: 65
-Release: 2%{?gver}%{?dist}
+Release: 3%{?gver}%{?dist}
Summary: Installer for game data files
License: GPLv2 and GPLv2+
-Url: https://wiki.debian.org/Games/GameDataPackager
+URL: https://wiki.debian.org/Games/GameDataPackager
%if 0%{?gitdate}
# git archive --prefix=game-data-packager-44/ --format tar.gz master > ../rpmbuild/SOURCES/game-data-packager-`date +%Y%m%d`.tar.gz
Source: game-data-packager-%{gitdate}.tar.gz
%else
Source: http://http.debian.net/debian/pool/contrib/g/game-data-packager/game-data...
%endif
+
BuildArch: noarch
+
+BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
BuildRequires: inkscape
BuildRequires: python3
@@ -38,6 +41,7 @@ BuildRequires: python3-pyflakes
#BuildRequires: xcftools
BuildRequires: xmlstarlet
BuildRequires: zip
+
Requires: python3-PyYAML
# download
Recommends: lgogdownloader
@@ -70,6 +74,7 @@ Summary: "Master Levels for Doom II" launcher
Requires: python3-gobject-base
Requires: gobject-introspection
Provides: game-data-packager-runtime = %{version}
+
%description -n doom2-masterlevels
This GUI let you select a WAD to play &
show it's description.
@@ -83,51 +88,58 @@ sed -i '/spear/d' tests/integration.py
%build
%configure
-make %{?_smp_mflags}
+%make_build
%check
DEB_BUILD_TIME_TESTS=1 make check
%install
-make DESTDIR=$RPM_BUILD_ROOT install
-find $RPM_BUILD_ROOT/usr/share/game-data-packager/game_data_packager -name '*.py' -exec chmod 755 {} \;
+%make_install
+find %{buildroot}%{_datadir}/game-data-packager/game_data_packager -name '*.py' -exec chmod 755 {} \;
#E: python-bytecode-inconsistent-mtime
-python3 -m compileall $RPM_BUILD_ROOT/usr/share/game-data-packager/game_data_packager/version.py
-find $RPM_BUILD_ROOT/etc/game-data-packager -empty -exec sh -c "echo '# we need more mirrors' > {}" \;
+python3 -m compileall %{buildroot}%{_datadir}/game-data-packager/game_data_packager/version.py
+find %{buildroot}%{_sysconfdir}/game-data-packager -empty -exec sh -c "echo '# we need more mirrors' > {}" \;
# throw away src:quake stuff for now
-rm -rvf $RPM_BUILD_ROOT/etc/apparmor.d
-rm -v $RPM_BUILD_ROOT/usr/bin/etqw*
-rm -v $RPM_BUILD_ROOT/usr/bin/quake*
+rm -rvf %{buildroot}%{_sysconfdir}/apparmor.d
+rm -v %{buildroot}%{_bindir}/etqw*
+rm -v %{buildroot}%{_bindir}/quake*
# 'lib64' in local build, 'lib' on buildd
-rm -vrf $RPM_BUILD_ROOT/usr/lib*
-rm -v $RPM_BUILD_ROOT/usr/share/applications/etqw.desktop
-rm -v $RPM_BUILD_ROOT/usr/share/applications/quake*.desktop
-rm -rv $RPM_BUILD_ROOT/usr/share/game-data-packager-runtime/
-rm -rv $RPM_BUILD_ROOT/usr/share/quake*
-rm -rv $RPM_BUILD_ROOT/usr/share/icons
-rm -v $RPM_BUILD_ROOT/usr/share/man/man6/etqw*.6
-rm -v $RPM_BUILD_ROOT/usr/share/man/man6/quake*.6
+rm -vrf %{buildroot}/usr/lib*
+rm -v %{buildroot}%{_datadir}/applications/etqw.desktop
+rm -v %{buildroot}%{_datadir}/applications/quake*.desktop
+rm -rv %{buildroot}%{_datadir}/game-data-packager-runtime/
+rm -rv %{buildroot}%{_datadir}/quake*
+rm -rv %{buildroot}%{_datadir}/icons
+rm -v %{buildroot}%{_mandir}/man6/etqw*.6
+rm -v %{buildroot}%{_mandir}/man6/quake*.6
+
+desktop-file-validate %{buildroot}%{_datadir}/applications/doom2-masterlevels.desktop
%files
%doc doc/adding_a_game.mdwn
+%license COPYING
%{_mandir}/man6/game-data-packager.*
%{_mandir}/fr/man6/game-data-packager.*
-%config(noreplace) %attr(644, root, root) /etc/game-data-packager.conf
-%config(noreplace) %attr(644, root, root) /etc/game-data-packager/*
-/usr/bin/game-data-packager
-/usr/share/bash-completion/completions/game-data-packager
-/usr/share/game-data-packager
-%license COPYING
+%config(noreplace) %{_sysconfdir}/game-data-packager.conf
+%config(noreplace) %{_sysconfdir}/game-data-packager/*
+%{_bindir}/game-data-packager
+%{_datadir}/bash-completion/completions/game-data-packager
+%{_datadir}/game-data-packager
%files -n doom2-masterlevels
-%{_mandir}/man6/doom2-masterlevels.*
-/usr/bin/doom2-masterlevels
-/usr/share/applications/doom2-masterlevels.desktop
-/usr/share/pixmaps/doom2-masterlevels.png
%license COPYING
+%{_mandir}/man6/doom2-masterlevels.*
+%{_bindir}/doom2-masterlevels
+%{_datadir}/applications/doom2-masterlevels.desktop
+%{_datadir}/pixmaps/doom2-masterlevels.png
%changelog
+* Mon Aug 24 2020 Leigh Scott <leigh123linux(a)gmail.com> - 65-3
+- Use the proper macros
+- Validate desktop file
+- Clean up spec file
+
* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 65-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
@@ -213,8 +225,8 @@ rm -v $RPM_BUILD_ROOT/usr/share/man/man6/quake*.6
* Sun Jan 24 2016 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 44-1
- First cross-distribution release
- Add Cacodemon icon to doom2-masterlevels subpackage
-- The (optional) licenses of generated .rpm goes now correctly to /usr/share/licenses
- instead of /usr/share/doc
+- The (optional) licenses of generated .rpm goes now correctly to %{_datadir}/licenses
+ instead of %{_datadir}/doc
- AppArmor support temporary disabled until figured out
* Thu Dec 31 2015 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 44-0.2.git2015123150f64b6
3 years, 8 months
[dream] Fixed FTBFS Resolves: rfbz#5697
by Jaroslav Škarvada
commit 42b1cb76612f2af9f745ca298bc2a43833c85330
Author: Jaroslav Škarvada <jskarvad(a)redhat.com>
Date: Mon Aug 24 17:59:14 2020 +0200
Fixed FTBFS
Resolves: rfbz#5697
dream-2.2-gpsd-3.20-fix.patch | 39 +++++++++++++++++++++++++++++++++++++++
dream.spec | 7 ++++++-
2 files changed, 45 insertions(+), 1 deletion(-)
---
diff --git a/dream-2.2-gpsd-3.20-fix.patch b/dream-2.2-gpsd-3.20-fix.patch
new file mode 100644
index 0000000..1fa23aa
--- /dev/null
+++ b/dream-2.2-gpsd-3.20-fix.patch
@@ -0,0 +1,39 @@
+diff --git a/src/GUI-QT/EvaluationDlg.cpp b/src/GUI-QT/EvaluationDlg.cpp
+index 627ecaa..4252c5e 100644
+--- a/src/GUI-QT/EvaluationDlg.cpp
++++ b/src/GUI-QT/EvaluationDlg.cpp
+@@ -789,7 +789,7 @@ void systemevalDlg::UpdateGPS(CParameter& Parameters)
+ if (gps.set&TIME_SET)
+ {
+ struct tm * p_ts;
+- time_t tt = time_t(gps.fix.time);
++ time_t tt = time_t(gps.fix.time.tv_sec);
+ p_ts = gmtime(&tt);
+ QChar fill('0');
+ qStrTime = QString("UTC: %1/%2/%3 %4:%5:%6 ")
+diff --git a/src/MDI/MDITagItems.cpp b/src/MDI/MDITagItems.cpp
+index 15e0c33..cb0de4e 100644
+--- a/src/MDI/MDITagItems.cpp
++++ b/src/MDI/MDITagItems.cpp
+@@ -1104,7 +1104,7 @@ CTagItemGeneratorGPS::GenTag(bool bIsValid, gps_data_t& gps_data) // Long/Lat in
+
+ if (gps_data.set&TIME_SET)
+ {
+- time_t time = (time_t)gps_data.fix.time;
++ time_t time = (time_t)gps_data.fix.time.tv_sec;
+ struct tm * ptm;
+ ptm = gmtime ( &time );
+ Enqueue((uint32_t) ptm->tm_hour, SIZEOF__BYTE);
+diff --git a/src/MDI/RSCITagItemDecoders.cpp b/src/MDI/RSCITagItemDecoders.cpp
+index 78b38aa..ec9cc8b 100644
+--- a/src/MDI/RSCITagItemDecoders.cpp
++++ b/src/MDI/RSCITagItemDecoders.cpp
+@@ -255,7 +255,7 @@ void CTagItemDecoderRgps::DecodeTag(CVector<_BINARY>& vecbiTag, const int iLen)
+ else
+ unsetenv("TZ");
+ #endif
+- gps_data.fix.time = t;
++ gps_data.fix.time.tv_sec = t;
+ gps_data.set |= TIME_SET;
+ }
+
diff --git a/dream.spec b/dream.spec
index fd515e9..073fad6 100644
--- a/dream.spec
+++ b/dream.spec
@@ -3,7 +3,7 @@
Name: dream
Version: 2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A software radio for AM and Digital Radio Mondiale (DRM)
License: GPLv2+
URL: https://sourceforge.net/projects/drm/
@@ -11,6 +11,7 @@ Source0: https://sourceforge.net/projects/drm/files/dream/%{version}/dream_%{ver
Source1: dream.desktop
Patch0: dream-2.2-use-system-libs.patch
Patch1: dream-2.2-hamlib-4-fix.patch
+Patch2: dream-2.2-gpsd-3.20-fix.patch
BuildRequires: gcc-c++, hamlib-devel, dos2unix, pulseaudio-libs-devel
BuildRequires: libpcap-devel, gpsd-devel, libsndfile-devel, speexdsp-devel, fftw-devel
BuildRequires: opus-devel, faad2-devel, qwt-qt5-devel, qt5-qtwebkit-devel
@@ -54,6 +55,10 @@ desktop-file-install --add-category="Utility" \
%{_mandir}/man1/*
%changelog
+* Mon Aug 24 2020 Jaroslav Škarvada <jskarvad(a)redhat.com> - 2.2-6
+- Fixed FTBFS
+ Resolves: rfbz#5697
+
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 8 months
[ffmpeg] Re-enable rav1e
by Leigh Scott
commit ed5aa0f6be942a3d57299755a8088d1de4e0997d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 24 14:59:53 2020 +0100
Re-enable rav1e
ffmpeg.spec | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 0a3f3c4..9dbe933 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -11,9 +11,8 @@
%global _without_vulkan 1
%endif
-# rav1e is rawhide only so there is no point enabling it.
-%if 0%{?fedora} > 33
-#global _with_rav1e 1
+%if 0%{?fedora} > 32
+%global _with_rav1e 1
%endif
# Cuda and others are only available on some arches
3 years, 8 months
[unifi] Update to 5.14.22.
by Richard Shaw
commit dcc5f9bc7dfa06b563a843abc363dbc8ce8f3f03
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Aug 24 08:04:34 2020 -0500
Update to 5.14.22.
.gitignore | 1 +
sources | 2 +-
unifi.spec | 12 ++++++++++--
3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e66b3ee..2b9a54f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/UniFi-5.12.66.unix.zip
/UniFi-5.12.72.unix.zip
/UniFi-5.13.32.unix.zip
+/UniFi-5.14.22.unix.zip
diff --git a/sources b/sources
index 24a32aa..bed29e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (UniFi-5.13.32.unix.zip) = f1258d4f8fa73f43385260245ca31ee5d159c99db005609a22b09cbe551a886ebf685069bf95be5a0609335fe9d7290bc04158eb2430bdaa238aa7a13da681ab
+SHA512 (UniFi-5.14.22.unix.zip) = 4bfa673cea02d014927844fcf4ab97c09581b4b9abe2eab618f388d74f4fa78c294f240beacfdc8a33316a9b73164224f114e28ea202f8b8930927183c11ec88
diff --git a/unifi.spec b/unifi.spec
index 22f37a6..bf08cae 100644
--- a/unifi.spec
+++ b/unifi.spec
@@ -4,8 +4,8 @@
%global __strip /bin/true
Name: unifi
-Version: 5.13.32
-Release: 2%{?dist}
+Version: 5.14.22
+Release: 1%{?dist}
Summary: Ubiquiti UniFi controller
License: Proprietary
@@ -108,11 +108,13 @@ Provides: bundled(j2objc-annotations) = 1.1
Provides: bundled(jackson-annotations) = 2.10.0
Provides: bundled(jackson-core) = 2.10.0
Provides: bundled(jackson-databind) = 2.10.0
+Provides: bundled(jackson-datatype-jdk8) = 2.10.0
Provides: bundled(jakarta.validation-api) = 2.0.2
Provides: bundled(java-ipv6) = 0.17
Provides: bundled(java-semver) = 0.9.0
Provides: bundled(javax.mail) = 1.6.2
Provides: bundled(jboss-logging) = 3.3.2.Final
+Provides: bundled(jcl-over-slf4j) = 1.7.28
Provides: bundled(jenetics) = 4.2.0
Provides: bundled(jmdns) = 3.4.1
Provides: bundled(joda-time) = 2.10.4
@@ -145,6 +147,8 @@ Provides: bundled(spring-aop) = 5.1.5
Provides: bundled(spring-beans) = 5.1.5
Provides: bundled(spring-context) = 5.1.5
Provides: bundled(spring-core) = 5.1.5
+Provides: bundled(spring-data-commons) = 1.13.23
+Provides: bundled(spring-data-mongodb) = 1.10.23
Provides: bundled(spring-expression) = 5.1.5
Provides: bundled(springfox-core) = 2.9.2
Provides: bundled(springfox-schema) = 2.9.2
@@ -156,6 +160,7 @@ Provides: bundled(springfox-swagger-ui) = 2.9.2
Provides: bundled(spring-plugin-core) = 1.2.0
Provides: bundled(spring-plugin-metadata) = 1.2.0
Provides: bundled(spring-test) = 5.1.5
+Provides: bundled(spring-tx) = 5.1.5
Provides: bundled(spring-web) = 5.1.5
Provides: bundled(spring-webmvc) = 5.1.5
Provides: bundled(spring-websocket) = 5.1.5
@@ -350,6 +355,9 @@ fi
%changelog
+* Sat Aug 24 2020 Richard Shaw <hobbes1069(a)gmail.com> - 5.14.22-1
+- Update to 5.14.22.
+
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 5.13.32-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 8 months
[gstreamer1-libav] Remove build requires yasm
by Leigh Scott
commit 279564152a4d5d9f549060fcde3d097bb19a1b2f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 24 10:13:13 2020 +0100
Remove build requires yasm
gstreamer1-libav.spec | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 1c4ebe6..cc6cbae 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -15,10 +15,6 @@ BuildRequires: bzip2-devel
BuildRequires: zlib-devel
BuildRequires: ffmpeg-devel
-%ifarch %{ix86} x86_64
-BuildRequires: yasm
-%endif
-
%description
GStreamer is a streaming media framework, based on graphs of filters which
operate on media data. Applications using this library can do anything
3 years, 8 months