[unifi] Update to 5.8.23.
by Richard Shaw
commit 8dd66dcc3c3d531572b76634ae58c2e0186ecdad
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sat Jun 30 14:50:23 2018 -0500
Update to 5.8.23.
.gitignore | 1 +
mongod.sh | 5 +++++
sources | 2 +-
unifi.service | 8 ++++----
unifi.spec | 19 ++++++++++++++++++-
unifi.xml | 2 +-
6 files changed, 30 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d36e69..557bb3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/UniFi-5.7.20.unix.zip
/UniFi-5.7.23.unix.zip
+/UniFi-5.8.23.unix.zip
diff --git a/mongod.sh b/mongod.sh
new file mode 100755
index 0000000..4fe02b2
--- /dev/null
+++ b/mongod.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+#
+# Workaround script for MongoDB 3.6 no longer accepting --nohttpinterface.
+#
+exec /usr/bin/mongod ${*//--nohttpinterface/}
diff --git a/sources b/sources
index 0cf8ffa..38624bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33e1cda0836ce170c731cc03da3e6e97 UniFi-5.7.23.unix.zip
+0468e7e612d84e76791323553cfb8618 UniFi-5.8.23.unix.zip
diff --git a/unifi.service b/unifi.service
index b370fca..ee71880 100644
--- a/unifi.service
+++ b/unifi.service
@@ -9,10 +9,10 @@ User=unifi
WorkingDirectory=/usr/share/unifi
# Has to be run though bash script due to java issue, see:
# https://bugzilla.redhat.com/show_bug.cgi?id=1358476#c20
-ExecStart=/usr/sbin/unifi start
-ExecStop=/usr/sbin/unifi stop
-#ExecStart=/usr/bin/java -jar /usr/share/unifi/lib/ace.jar start
-#ExecStop=/usr/bin/java -jar /usr/share/unifi/lib/ace.jar stop
+#ExecStart=/usr/sbin/unifi start
+#ExecStop=/usr/sbin/unifi stop
+ExecStart=/usr/bin/java -jar /usr/share/unifi/lib/ace.jar start
+ExecStop=/usr/bin/java -jar /usr/share/unifi/lib/ace.jar stop
Restart=on-success
[Install]
diff --git a/unifi.spec b/unifi.spec
index 46e6ca6..c23bd15 100644
--- a/unifi.spec
+++ b/unifi.spec
@@ -4,7 +4,7 @@
%global __strip /bin/true
Name: unifi
-Version: 5.7.23
+Version: 5.8.23
Release: 1%{?dist}
Summary: Ubiquiti UniFi controller
@@ -15,6 +15,7 @@ Source1: unifi.service
Source3: unifi.xml
Source4: unifi.logrotate
Source5: unifi.sh
+Source6: mongod.sh
Source100: PERMISSION-1.html
Source101: PERMISSION-2.html
Source102: SETUP
@@ -201,6 +202,15 @@ install %{SOURCE5} %{buildroot}%{_sbindir}/%{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...
+#
+%if 0%{?fedora} >= 28
+ install -pm 0755 %{SOURCE6} %{buildroot}%{_datadir}/unifi/bin/mongod
+%endif
+
+
%pre
# Migrate UniFi log to the proper directory
@@ -280,6 +290,13 @@ fi
%changelog
+* Sat Jun 30 2018 Richard Shaw <hobbes1069(a)gmail.com> - 5.8.23-1
+- Update to 5.8.23.
+
+* Mon May 07 2018 Richard Shaw <hobbes1069(a)gmail.com> - 5.7.23-2
+- Add workaround shell script to prevent --nohttpdinterface from being passed to
+ MongoDB.
+
* Tue Apr 17 2018 Richard Shaw <hobbes1069(a)gmail.com> - 5.7.23-1
- Update to 5.7.23.
diff --git a/unifi.xml b/unifi.xml
index 69b08f5..bfd19be 100644
--- a/unifi.xml
+++ b/unifi.xml
@@ -9,5 +9,5 @@
<port port="8843" protocol="tcp"/>
<port port="8880" protocol="tcp"/>
<port port="10001" protocol="udp"/>
- <port port="27117" protocol="tcp"/>
+<!-- <port port="27117" protocol="tcp"/> -->
</service>
6 years, 5 months
[broadcom-wl] Move AppStream Metadata to /usr/share/metainfo directory Added appstream-util validate-relax to conf
by Nicolas Viéville
commit a98afae272ae9fadbe9e0286f11ad37ae687c815
Author: Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr>
Date: Fri Jun 29 22:14:46 2018 +0200
Move AppStream Metadata to /usr/share/metainfo directory
Added appstream-util validate-relax to conform with f28 packaging guidelines
broadcom-wl.spec | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/broadcom-wl.spec b/broadcom-wl.spec
index b8664aa..c41a502 100644
--- a/broadcom-wl.spec
+++ b/broadcom-wl.spec
@@ -11,7 +11,7 @@
Name: broadcom-wl
Version: 6.30.223.271
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -35,7 +35,7 @@ ExcludeArch: ppc ppc64
%if 0%{?fedora} >= 25
# AppStream metadata generation
BuildRequires: python3
-BuildRequires: libappstream-glib >= 0.6.3
+BuildRequires: libappstream-glib
%endif
%description
@@ -65,13 +65,14 @@ install -m 0755 -d %{buildroot}%{_sysconfdir}/akmods/akmod-wl/
install -p -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/akmods/akmod-wl/
%if 0%{?fedora} >= 25
# install AppData and add modalias provides
-install -m 0755 -d %{buildroot}%{_datadir}/appdata/
-install -p -m 0644 %{SOURCE7} %{buildroot}%{_datadir}/appdata/
-fn=%{buildroot}%{_datadir}/appdata/com.broadcom.wireless.hybrid.driver.metainfo.xml
+install -m 0755 -d %{buildroot}%{_datadir}/metainfo/
+install -p -m 0644 %{SOURCE7} %{buildroot}%{_datadir}/metainfo/
+fn=%{buildroot}%{_datadir}/metainfo/com.broadcom.wireless.hybrid.driver.metainfo.xml
# As appstream-util deletes all comments in the metainfo.xml file, the
# copyright must be saved and re-written to the resulting file.
copyright_string=$(grep Copyright ${fn})
python3 %{SOURCE8} README_6.30.223.271.txt "SUPPORTED DEVICES" | xargs appstream-util add-provide ${fn} modalias
+appstream-util validate-relax --nonet ${fn}
grep -q Copyright ${fn} >/dev/null || sed -i "s%\(^<?xml.*$\)%\1\n${copyright_string}%" ${fn}
%endif
@@ -86,13 +87,17 @@ grep -q Copyright ${fn} >/dev/null || sed -i "s%\(^<?xml.*$\)%\1\n${copyright_st
%doc lib/LICENSE.txt
%endif
%if 0%{?fedora} >= 25
-%{_datadir}/appdata/com.broadcom.wireless.hybrid.driver.metainfo.xml
+%{_datadir}/metainfo/com.broadcom.wireless.hybrid.driver.metainfo.xml
%endif
%config(noreplace) %{_modprobe_d}/broadcom-wl-blacklist.conf
%config(noreplace) %{_dracut_conf_d}/20-wl.conf
%config(noreplace) %{_sysconfdir}/akmods/akmod-wl/api
%changelog
+* Fri Jun 29 2018 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-6
+- Move AppStream Metadata to /usr/share/metainfo directory
+- Added appstream-util validate-relax to conform with f28 packaging guidelines
+
* Wed Apr 18 2018 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-5
- Added AppStream Metadata
- Update new Broadcom upstream URLs in SPEC file
6 years, 5 months
[telegram-desktop/f27] Updated to version 1.3.9.
by Vitaly Zaitsev
commit 0b7d872fa2c70711f9d1c0ed19ae087aff928497
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Jun 29 15:13:53 2018 +0200
Updated to version 1.3.9.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-api-tokens.patch | 6 +++---
telegram-desktop-build-fixes.patch | 2 +-
telegram-desktop-system-fonts.patch | 4 ++--
telegram-desktop.spec | 9 ++++++---
6 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b338edf..308aae2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@
/tdesktop-1.3.7.tar.gz
/crl-9bc641f.tar.gz
/tdesktop-1.3.8.tar.gz
+/tdesktop-1.3.9.tar.gz
diff --git a/sources b/sources
index c204545..5318be9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
a83f06b2b163c242d20e1ff74711b7d5 crl-9bc641f.tar.gz
-c39c06c2ab3ee1c77a1dd1d8fbae51f9 tdesktop-1.3.8.tar.gz
+acb1029cfef389fdee586edc439b5058 tdesktop-1.3.9.tar.gz
diff --git a/telegram-desktop-api-tokens.patch b/telegram-desktop-api-tokens.patch
index a9d7079..8126e87 100644
--- a/telegram-desktop-api-tokens.patch
+++ b/telegram-desktop-api-tokens.patch
@@ -1,4 +1,4 @@
-From 68611ba0b2a923df5dd3b711c2db386c472e138a Mon Sep 17 00:00:00 2001
+From f159a390f8441980776e3fa1e3ed3dedc0b9e32c Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon, 9 Apr 2018 16:57:13 +0200
Subject: [PATCH] Changed default Telegram Desktop's test API keys to obtained
@@ -10,10 +10,10 @@ Subject: [PATCH] Changed default Telegram Desktop's test API keys to obtained
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
-index 5bcb92472..484cbecbb 100644
+index e77b81092..b5856d949 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
-@@ -199,8 +199,8 @@ w/CVnbwQOw0g5GBwwFV3r0uTTvy44xx8XXxk+Qknu4eBCsmrAFNnAgMBAAE=\n\
+@@ -197,8 +197,8 @@ w/CVnbwQOw0g5GBwwFV3r0uTTvy44xx8XXxk+Qknu4eBCsmrAFNnAgMBAAE=\n\
#ifdef CUSTOM_API_ID
#include "../../../TelegramPrivate/custom_api_id.h" // Custom API id and API hash
#else
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 7b18e24..68b2714 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 53b49781f0c34857ac25117d1ee79d1924c737ce Mon Sep 17 00:00:00 2001
+From 8b674a0b114fe4780ee95070cf810bb12aee392c Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index ab1475d..1b5f4f0 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From b2dc2e3a61740b7a61ec1f7c916eeff49f849bd5 Mon Sep 17 00:00:00 2001
+From d44202d9bd365ad5978731b96ae15b14b9b211ae Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun, 24 Jun 2018 22:59:34 +0200
Subject: [PATCH] Backported and rebased patch from Debian maintainer Nicholas
@@ -25,7 +25,7 @@ index 48b4398eb..be995db75 100644
<file alias="art/bg_initial.jpg">../art/bg_initial.jpg</file>
<file alias="art/logo_256.png">../art/logo_256.png</file>
diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
-index 0f610cb8a..3b06f27cd 100644
+index 71f318229..8912791a3 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
@@ -70,9 +70,9 @@ void Start() {
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index f18aa1c..e982d53 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -10,7 +10,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.3.8
+Version: 1.3.9
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -45,10 +45,10 @@ BuildRequires: gcc
BuildRequires: gyp
# Development packages for Telegram Desktop...
-BuildRequires: guidelines-support-library-devel
+BuildRequires: guidelines-support-library-devel >= 1.0.0
+BuildRequires: mapbox-variant-devel >= 0.3.6
BuildRequires: libtgvoip-devel >= 2.1
BuildRequires: libappindicator-devel
-BuildRequires: mapbox-variant-devel
BuildRequires: ffmpeg-devel >= 3.1
BuildRequires: openal-soft-devel
BuildRequires: qt5-qtbase-devel
@@ -134,6 +134,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Fri Jun 29 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.9-1
+- Updated to 1.3.9.
+
* Sun Jun 24 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.8-1
- Updated to 1.3.8.
6 years, 5 months
[flowblade] Update to 1.16.0-3.git3fdb76d Add BR libappstream-glib
by Martin Gansser
commit 59aaffc33aa6c659dc876aedc06a71ee2f9e9e1a
Author: Martin Gansser <mgansser(a)online.de>
Date: Fri Jun 29 14:32:40 2018 +0200
Update to 1.16.0-3.git3fdb76d
Add BR libappstream-glib
.gitignore | 1 +
flowblade.spec | 40 +++++++++++++++++++++++++++-------------
sources | 2 +-
3 files changed, 29 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b1f8c5..2a7fb3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/flowblade-1.12.0-fd577a9.tar.gz
/flowblade-1.14.0-c2cc6a8.tar.gz
/flowblade-1.16.0-d2f153f.tar.gz
+/flowblade-1.16.0-3fdb76d.tar.gz
diff --git a/flowblade.spec b/flowblade.spec
index e7ff42b..5064302 100644
--- a/flowblade.spec
+++ b/flowblade.spec
@@ -1,10 +1,10 @@
-# https://github.com/jliljebl/flowblade/commit/d2f153f86e7f90c1a9baab1c4fd0...
-%global commit0 d2f153f86e7f90c1a9baab1c4fd0caa9e47c7f44
+# https://github.com/jliljebl/flowblade/commit/3fdb76d2331e2a4c7ea2b3cb4c93...
+%global commit0 3fdb76d2331e2a4c7ea2b3cb4c9300a33e1b39af
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Name: flowblade
Version: 1.16.0
-Release: 2.git%{shortcommit0}%{?dist}
+Release: 3.git%{shortcommit0}%{?dist}
License: GPLv3
Summary: Multitrack non-linear video editor for Linux
Url: https://github.com/jliljebl/flowblade
@@ -12,6 +12,7 @@ Source0: %{url}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar
Patch0: flowblade-001_sys_path.patch
BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
BuildRequires: python2-devel
BuildRequires: python2-setuptools
Requires: ffmpeg
@@ -69,34 +70,47 @@ sed -i "s|respaths.LOCALE_PATH|'%{_datadir}/locale'|g" Flowblade/translations.py
%py2_install
# fix permissions
-chmod +x %{buildroot}%{python_sitelib}/Flowblade/launch/*
+chmod +x %{buildroot}%{python2_sitelib}/Flowblade/launch/*
# setup of mime is already done, so for what we need this file ?
-%{__rm} %{buildroot}/usr/lib/mime/packages/flowblade
+rm %{buildroot}/usr/lib/mime/packages/flowblade
# move .mo files to /usr/share/locale the right place
-for i in $(ls -d %{buildroot}%{python_sitelib}/Flowblade/locale/*/LC_MESSAGES/ | sed 's/\(^.*locale\/\)\(.*\)\(\/LC_MESSAGES\/$\)/\2/') ; do
+for i in $(ls -d %{buildroot}%{python2_sitelib}/Flowblade/locale/*/LC_MESSAGES/ | sed 's/\(^.*locale\/\)\(.*\)\(\/LC_MESSAGES\/$\)/\2/') ; do
mkdir -p %{buildroot}%{_datadir}/locale/$i/LC_MESSAGES/
- mv %{buildroot}%{python_sitelib}/Flowblade/locale/$i/LC_MESSAGES/%{name}.mo \
+ mv %{buildroot}%{python2_sitelib}/Flowblade/locale/$i/LC_MESSAGES/%{name}.mo \
%{buildroot}%{_datadir}/locale/$i/LC_MESSAGES/
done
+
+# E: non-executable-script
+chmod a+x %{buildroot}%{python2_sitelib}/Flowblade/tools/clapperless.py
+
+install -d -m 0755 %{buildroot}%{python2_sitelib}/Flowblade/res/css
+cp Flowblade/res/css/gtk-dark-fix.css %{buildroot}%{python2_sitelib}/Flowblade/res/css
+
%find_lang %{name}
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
%files -f %{name}.lang
%doc README
%license COPYING
-%{_bindir}/flowblade
-%{_datadir}/applications/flowblade.desktop
-%{_mandir}/man1/flowblade.1.*
-%{_datadir}/mime/packages/flowblade.xml
-%{_datadir}/pixmaps/flowblade.png
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_mandir}/man1/%{name}.1.*
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%{python2_sitelib}/Flowblade/
-%{python2_sitelib}/flowblade*
+%{python2_sitelib}/%{name}*
%changelog
+* Thu Jun 28 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 1.16.0-3.git3fdb76d
+- Update to 1.16.0-3.git3fdb76d
+- Add BR libappstream-glib
+
* Sun Apr 01 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 1.16.0-2.gitd2f153f
- Use url macro to shorten line
- Fix python requires for f28 and remove old mlt-freeworld conditional
diff --git a/sources b/sources
index 0bde0bd..a4004b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a6237afb1d166a3a65ab44c4b02e1dc flowblade-1.16.0-d2f153f.tar.gz
+3789981233b3fe6f874d6537fa006a4f flowblade-1.16.0-3fdb76d.tar.gz
6 years, 5 months