[nvidia-340xx-kmod/f31: 2/2] Merge branch 'master' into f31
by Leigh Scott
commit d0a8bcafb03bbae6fe7a08821e9e47a87eda7f61
Merge: 6503891 2a0972f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Aug 27 14:21:40 2020 +0100
Merge branch 'master' into f31
kernel-5.8.patch | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-340xx-kmod.spec | 9 +++++--
2 files changed, 78 insertions(+), 2 deletions(-)
---
4 years, 2 months
[unifi] Remove mongod.sh from sources.
by Richard Shaw
commit 29a1079a5d2cdddf7714c132b8eb22d7e76e025b
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Thu Aug 27 08:04:08 2020 -0500
Remove mongod.sh from sources.
unifi.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/unifi.spec b/unifi.spec
index 48a9a46..c585211 100644
--- a/unifi.spec
+++ b/unifi.spec
@@ -16,7 +16,6 @@ Source1: unifi.service
Source2: unifi.xml
Source3: unifi-cloud.xml
Source4: unifi.logrotate
-Source6: mongod.sh
Source100: PERMISSION-1.html
Source101: PERMISSION-2.html
Source102: SETUP
4 years, 2 months
[performous] Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
by Sérgio M. Basto
commit e080ff3402c5f2aae3a45a153ea0b04cc4eb89ab
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Aug 27 12:15:24 2020 +0100
Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
.gitignore | 3 ++
pango-1.44.7_buildfix.patch | 86 ---------------------------------------------
performous.spec | 38 ++++++++++----------
sources | 5 +--
4 files changed, 26 insertions(+), 106 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ce91cba..647b5f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
/performous-1.1.tar.gz
/ced-9d2d658.tar.gz
/performous-4ed8ec7.tar.gz
+/performous-997f488.tar.gz
+/ced-26faf8f.tar.gz
+/aubio-712511e.tar.gz
diff --git a/performous.spec b/performous.spec
index ac7830d..087c006 100644
--- a/performous.spec
+++ b/performous.spec
@@ -1,22 +1,22 @@
-%global commit0 4ed8ec78452a5c9e1aad55915378f301a4aa4bca
-%global gitdate 20190419
+%global commit0 997f48846e67a36cf1362ee037adc08f824d6336
+%global gitdate 20200604
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global __cmake_in_source_build 1
+%undefine __cmake_in_source_build
Name: performous
-Version: 1.2
-Release: 0.8.%{gitdate}git%{shortcommit0}%{?dist}
+Version: 2.0.0
+Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist}
Summary: Free cross-platform music and rhythm / party game
# The main code is GPLv2+, and there are fonts under ASL 2.0 and SIL licenses
License: GPLv2+ and ASL 2.0 and OFL
-URL: http://performous.org
+URL: https://performous.org
Source0: https://github.com/performous/performous/archive/%{commit0}/%{name}-%{sho...
-Source1: https://github.com/performous/compact_enc_det/archive/9d2d658/ced-9d2d658...
+Source1: https://github.com/performous/compact_enc_det/archive/26faf8f/ced-26faf8f...
+Source4: https://github.com/performous/aubio/archive/712511e/aubio-712511e.tar.gz
Source2: https://raw.githubusercontent.com/performous/performous/master/licence.txt
Source3: performous.appdata.xml
-Patch0: https://patch-diff.githubusercontent.com/raw/performous/performous/pull/4...
BuildRequires: alsa-lib-devel
BuildRequires: boost-devel
@@ -46,12 +46,17 @@ BuildRequires: libxml++-devel
BuildRequires: libraw1394-devel
BuildRequires: libtheora-devel
BuildRequires: opencv-devel
+BuildRequires: openblas-devel
+BuildRequires: blas-devel
+BuildRequires: lapack-devel
+BuildRequires: fftw-devel
BuildRequires: openssl-devel
BuildRequires: pango-devel
BuildRequires: portaudio-devel
BuildRequires: portmidi-devel
BuildRequires: recode
BuildRequires: SDL2-devel
+BuildRequires: python
Requires: %{name}-data = %{version}-%{release}
@@ -74,26 +79,23 @@ package.
%prep
%autosetup -p1 -n %{name}-%{commit0}
-tar -xf %{SOURCE1} -C ced/ --strip 1
+tar -xf %{SOURCE1} -C 3rdparty/ced/ --strip 1
+tar -xf %{SOURCE4} -C 3rdparty/aubio/ --strip 1
cp -p %{SOURCE2} .
cp -p "docs/license/SIL OFL Font License New Rocker.txt" SIL-OFL.txt
%build
-mkdir -p build
-cd build
# Jack support is disabled because the engine can't be chosen at run-time and
# jack will always take precedence over pulseaudio
#%%cmake -DSHARE_INSTALL:PATH=share/performous \
-%cmake3 -DSHARE_INSTALL:PATH=%{_datadir}/performous \
- -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
- ..
-%make_build
+%cmake -DSHARE_INSTALL:PATH=%{_datadir}/performous \
+ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DUSE_BOOST_REGEX=1
+%cmake_build
%install
-cd build
-%make_install
+%cmake_install
## Menu
mkdir -p %buildroot%{_datadir}/applications
@@ -111,7 +113,7 @@ rm -rf %buildroot%{_libdir}/*.{a,la}
%ldconfig_scriptlets
-%files -f build/Performous.lang
+%files -f Performous.lang
%license licence.txt
%doc docs/*.txt
%{_bindir}/*
diff --git a/sources b/sources
index 50a287f..8aa955e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-539a38986f659f27e5d7892980bc607c ced-9d2d658.tar.gz
-d4dafa65d611beb76e7d70994ec65baf performous-4ed8ec7.tar.gz
+SHA512 (performous-997f488.tar.gz) = a9aa3125b26debf5f07b6518d296d00620793f667cebca4856b95c7371b6c20484a6d326183293a696527f42995b06a5dfb1b806c481734fee1d73cc0d61445c
+SHA512 (ced-26faf8f.tar.gz) = 6dbd8f99e18f9b1aa6562938a148789b540d6d52f48289d140a02745ef5190bd84f3f658ec89e7fa72f2640f4d42e165bf4fba29a5b1a51f4aea2490613341ab
+SHA512 (aubio-712511e.tar.gz) = bebfba9b53d22f078b3c0a4a77deeaf3fe8f1015ce441d2309311c4b1c696f8596b94182bb1f2bf65d40e91227d69d696f42a1dadb2944344ab76c21844b9a86
4 years, 2 months
[unifi/el8] Update to 5.14.23, for details see: https://community.ui.com/releases/UniFi-Network-Controller-5-1
by Richard Shaw
commit 86ba0eff39b75a9dfa43e4f4e927362c53c66b66
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Thu Aug 27 08:00:12 2020 -0500
Update to 5.14.23, for details see:
https://community.ui.com/releases/UniFi-Network-Controller-5-14-23/daf907...
Remove workaround for MongoDB 3.6 as it is no longer required.
.gitignore | 1 +
mongod.sh | 5 -----
sources | 2 +-
unifi.spec | 15 +++++++--------
4 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2b9a54f..4a6ad60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/UniFi-5.12.72.unix.zip
/UniFi-5.13.32.unix.zip
/UniFi-5.14.22.unix.zip
+/UniFi-5.14.23.unix.zip
diff --git a/sources b/sources
index bed29e5..dff4ccd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (UniFi-5.14.22.unix.zip) = 4bfa673cea02d014927844fcf4ab97c09581b4b9abe2eab618f388d74f4fa78c294f240beacfdc8a33316a9b73164224f114e28ea202f8b8930927183c11ec88
+SHA512 (UniFi-5.14.23.unix.zip) = e29969da15bed74fe24eb7b997c14247f3e8c53cc43021c402365f93cda3b7cc48b9222235770101ab37cdd574eb94d1aba445bc04393b70dac386b7a77cebb9
diff --git a/unifi.spec b/unifi.spec
index bf08cae..48a9a46 100644
--- a/unifi.spec
+++ b/unifi.spec
@@ -4,7 +4,7 @@
%global __strip /bin/true
Name: unifi
-Version: 5.14.22
+Version: 5.14.23
Release: 1%{?dist}
Summary: Ubiquiti UniFi controller
@@ -273,12 +273,6 @@ install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
# Install forum messages giving permission to redistribute.
install -p %{SOURCE100} %{SOURCE101} .
-#
-# Workaround script for MongoDB 3.6 no longer accepting --nohttpinterface.
-# See: https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/m-p/232...
-#
-install -pm 0755 %{SOURCE6} %{buildroot}%{_datadir}/unifi/bin/mongod
-
# Install sysconfig file.
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
cat > %{buildroot}%{_sysconfdir}/sysconfig/%{name} <<EOL
@@ -355,7 +349,12 @@ fi
%changelog
-* Sat Aug 24 2020 Richard Shaw <hobbes1069(a)gmail.com> - 5.14.22-1
+* Thu Aug 27 2020 Richard Shaw <hobbes1069(a)gmail.com> - 5.14.23-1
+- Update to 5.14.23, for details see:
+ https://community.ui.com/releases/UniFi-Network-Controller-5-14-23/daf907...
+- Remove workaround for MongoDB 3.6 as it is no longer required.
+
+* Mon 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
4 years, 2 months
[megasync/f33] Correct cmake build.
by Vasiliy Glazov
Summary of changes:
4b542c9... Correct cmake build. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 2 months