[unifi] Update to 5.10.25. Remove obsolete shell script, unifi,sh. Remove --add-modules workaround as it doe
by Richard Shaw
commit 2ac1c3b811b2e5bc26a64468fc38cc1a1050f815
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sun Jun 30 18:33:55 2019 -0500
Update to 5.10.25.
Remove obsolete shell script, unifi,sh.
Remove --add-modules workaround as it does not apply to JRE 8 (OpenJDK 1.8.0).
.gitignore | 1 +
sources | 2 +-
unifi.service | 4 ----
unifi.sh | 2 --
unifi.spec | 35 ++++++++---------------------------
5 files changed, 10 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 98df7ed..e73c932 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/UniFi-5.10.21.unix.zip
/UniFi-5.10.23.unix.zip
/UniFi-5.10.24.unix.zip
+/UniFi-5.10.25.unix.zip
diff --git a/sources b/sources
index a9acf0f..6205213 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c410f186dccfb12675b78a2f2bf640a UniFi-5.10.24.unix.zip
+782a97c0fbce2aace48decad92e11e3d UniFi-5.10.25.unix.zip
diff --git a/unifi.service b/unifi.service
index b4076e5..5e4806d 100644
--- a/unifi.service
+++ b/unifi.service
@@ -8,10 +8,6 @@ Type=simple
User=unifi
WorkingDirectory=/usr/share/unifi
EnvironmentFile=-/etc/sysconfig/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 $JAVA_OPTS -jar /usr/share/unifi/lib/ace.jar start
ExecStop=/usr/bin/java $JAVA_OPTS -jar /usr/share/unifi/lib/ace.jar stop
Restart=on-success
diff --git a/unifi.spec b/unifi.spec
index e120ca3..1ec0292 100644
--- a/unifi.spec
+++ b/unifi.spec
@@ -4,7 +4,7 @@
%global __strip /bin/true
Name: unifi
-Version: 5.10.24
+Version: 5.10.25
Release: 1%{?dist}
Summary: Ubiquiti UniFi controller
@@ -15,7 +15,6 @@ Source0: http://dl.ubnt.com/unifi/%{version}/UniFi.unix.zip#/UniFi-%{vers
Source1: unifi.service
Source3: unifi.xml
Source4: unifi.logrotate
-Source5: unifi.sh
Source6: mongod.sh
Source100: PERMISSION-1.html
Source101: PERMISSION-2.html
@@ -29,12 +28,8 @@ Requires: firewalld-filesystem
BuildRequires: firewalld-filesystem
BuildRequires: %{_bindir}/execstack
-%if 0%{?fedora} > 29
# https://fedoraproject.org/wiki/Changes/MongoDB_Removal
Requires: /usr/bin/mongod
-%else
-Requires: mongodb-server
-%endif
Requires: java-1.8.0-openjdk-headless
Requires(post): policycoreutils-python
Requires(postun): policycoreutils-python
@@ -201,11 +196,6 @@ find %{buildroot}%{_libdir} -name libubnt_webrtc_jni.so -exec execstack -c {} \;
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-# Install wrapper script for java to workaround lack of $ORIGIN when executed
-# directly.
-mkdir -p %{buildroot}%{_sbindir}
-install %{SOURCE5} %{buildroot}%{_sbindir}/%{name}
-
# Install forum messages giving permission to redistribute.
install -p %{SOURCE100} %{SOURCE101} .
@@ -213,24 +203,11 @@ 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
+install -pm 0755 %{SOURCE6} %{buildroot}%{_datadir}/unifi/bin/mongod
-#
-# Workaround for java.activation module being depreceated in Java 10
-# It is removed from Java 11 (worry about it when it's in Fedora)
-# Fixes RFBZ#5080, also see:
-# https://community.ubnt.com/t5/UniFi-Wireless/Running-Unifi-Controller-on-...
-#
+# Install empty sysconfig file for packaging.
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-%if 0%{?fedora} > 29
-cat << EOF > %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-JAVA_OPTS="--add-modules java.activation"
-EOF
-%else
touch %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-%endif
%pre
@@ -284,7 +261,6 @@ fi
%{_datadir}/unifi/lib/native/
%endif
%{_datadir}/unifi/bin/mongod
-%{_sbindir}/%{name}
%{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_unitdir}/%{name}.service
@@ -303,6 +279,11 @@ fi
%changelog
+* Sun Jun 30 2019 Richard Shaw <hobbes1069(a)gmail.com> - 5.10.25-1
+- Update to 5.10.25.
+- Remove obsolete shell script, unifi,sh.
+- Remove --add-modules workaround as it does not apply to JRE 8 (OpenJDK 1.8.0).
+
* Sat Jun 01 2019 Richard Shaw <hobbes1069(a)gmail.com> - 5.10.24-1
- Update to 5.10.24.
4 years, 10 months
[kodi] Fix filename of manpage
by Michael Cronenworth
commit 8214806faa6119c913e735ee0dcfb5fb568d2605
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Sun Jun 30 14:00:43 2019 -0500
Fix filename of manpage
kodi.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/kodi.spec b/kodi.spec
index d306d10..7308ad2 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -429,7 +429,7 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/
# Remove wiiremote man page if support was disabled
%if ! 0%{?_with_cwiid}
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1.gz
+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%endif
4 years, 10 months
[vdr-vaapidevice] Rebuilt for new VDR API version
by Martin Gansser
commit 079f18a24b99d69080e5ff8c6b806975256ea038
Author: Martin Gansser <mgansser(a)online.de>
Date: Sun Jun 30 19:52:35 2019 +0200
Rebuilt for new VDR API version
vdr-vaapidevice.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vdr-vaapidevice.spec b/vdr-vaapidevice.spec
index 6db2f29..09ad614 100644
--- a/vdr-vaapidevice.spec
+++ b/vdr-vaapidevice.spec
@@ -6,7 +6,7 @@
Name: vdr-vaapidevice
Version: 0.7.0
-Release: 12.%{gitdate}git%{shortcommit0}%{?dist}
+Release: 13.%{gitdate}git%{shortcommit0}%{?dist}
Summary: A VA-API output device plugin for VDR
License: AGPLv3
@@ -71,6 +71,9 @@ install -Dpm 644 %{SOURCE1} \
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/vaapidevice.conf
%changelog
+* Sun Jun 30 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 0.7.0-13.20190526gitd19657b
+- Rebuilt for new VDR API version
+
* Fri Jun 28 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 0.7.0-12.20190526gitd19657b
- Update to 0.7.0-12.20190526gitd19657b
4 years, 10 months
[vdr-skindesigner] Rebuilt for new VDR API version
by Martin Gansser
commit 0913efea14228b285e1d182e48fa0b1572dcacad
Author: Martin Gansser <mgansser(a)online.de>
Date: Sun Jun 30 19:44:51 2019 +0200
Rebuilt for new VDR API version
vdr-skindesigner.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vdr-skindesigner.spec b/vdr-skindesigner.spec
index 68b19d0..1706d9e 100644
--- a/vdr-skindesigner.spec
+++ b/vdr-skindesigner.spec
@@ -2,7 +2,7 @@
Name: vdr-skindesigner
Version: 1.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A VDR skinning engine that displays XML based Skins
License: GPLv2+
URL: http://projects.vdr-developer.org/projects/plg-skindesigner
@@ -122,6 +122,9 @@ ldconfig -n %{buildroot}%{_libdir}
%{_includedir}/libskindesignerapi/*
%changelog
+* Sun Jun 30 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 1.2.8-2
+- Rebuilt for new VDR API version
+
* Sat Jun 22 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 1.2.8-1
- Update to 1.2.8
- Dropped skindesigner.diff.gz
4 years, 10 months
