12:58 a.m.
commit f5636014863b17dbcfa40905db43a991668ac3e7
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Thu Oct 17 19:58:12 2024 -0500
Update to 8.5.6.
.gitignore | 1 +
sources | 2 +-
unifi.spec | 13 ++++---------
version-scan.sh | 7 ++++---
4 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d098f52..e348cc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@
/UniFi-8.3.32.unix.zip
/UniFi-8.4.59.unix.zip
/UniFi-8.4.62.unix.zip
+/UniFi-8.5.6.unix.zip
diff --git a/sources b/sources
index 2762562..e643fd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (UniFi-8.4.62.unix.zip) =
9a93db1786b3b6136ffdd46e5c6ed801f2762e81c972d0023de2aac9e3f6c8535e12416cfed9d7320175a39bc5dde9a95990a2251486b1243424af05f551584c
+SHA512 (UniFi-8.5.6.unix.zip) =
ff5f477be142fc9ea650cff4bf8eed3622bee60fa1513857000831eefd730bff9432aa218b3ae54ee1ac5ee592eb7ced4a4fc00347a353cb8529f2a9a8735e94
diff --git a/unifi.spec b/unifi.spec
index 33abf55..193175e 100644
--- a/unifi.spec
+++ b/unifi.spec
@@ -4,7 +4,7 @@
%global __strip /bin/true
Name: unifi
-Version: 8.4.62
+Version: 8.5.6
Release: 1%{?dist}
Summary: UniFi Network Controller
@@ -49,10 +49,6 @@ Provides: bundled(ubnt-fonts)
# Bundled java libraries
### BEGIN AUTOMATION ###
-Provides: bundled(ace) = 9999
-Provides: bundled(analytics-api) = 2.0.0
-Provides: bundled(analytics-client) = 2.0.0
-Provides: bundled(analytics-privacy) = 2.0.0
Provides: bundled(angus-activation) = 2.0.2
Provides: bundled(annotations) = 3.0.1
Provides: bundled(api-common) = 1.7.0
@@ -68,7 +64,6 @@ Provides: bundled(bson) = 4.11.2
Provides: bundled(bson-record-codec) = 4.11.2
Provides: bundled(checker-qual) = 3.42.0
Provides: bundled(classmate) = 1.6.0
-Provides: bundled(coloring) = 1.0
Provides: bundled(commons-beanutils) = 1.9.4
Provides: bundled(commons-codec) = 1.16.1
Provides: bundled(commons-io) = 2.16.1
@@ -123,10 +118,8 @@ Provides: bundled(jakarta.validation-api) = 3.0.2
Provides: bundled(jakarta.xml.bind-api) = 4.0.2
Provides: bundled(java10-shim) = 20240325.1
Provides: bundled(java8-shim) = 20240325.1
-Provides: bundled(java-binme) = 2.0.0
Provides: bundled(java-ipv6) = 0.17
Provides: bundled(java-semver) = 0.9.0
-Provides: bundled(java-ucp) = 1.1
Provides: bundled(java-uuid-generator) = 4.3.0
Provides: bundled(jaxb-api) = 2.2.12
Provides: bundled(jaxb-core) = 4.0.5
@@ -163,7 +156,6 @@ Provides: bundled(protobuf-java-util) = 3.6.0
Provides: bundled(proto-google-common-protos) = 1.12.0
Provides: bundled(proto-google-iam-v1) = 0.12.0
Provides: bundled(pull-parser) = 2.1.10
-Provides: bundled(radclient4) = 2.1.10
Provides: bundled(reactive-streams) = 1.0.4
Provides: bundled(reactor-core) = 3.6.7
Provides: bundled(relaxngDatatype) = 20020414
@@ -373,6 +365,9 @@ fi
%changelog
+* Fri Oct 18 2024 Richard Shaw <hobbes1069(a)gmail.com> - 8.5.6-1
+- Update to 8.5.6.
+
* Tue Oct 08 2024 Richard Shaw <hobbes1069(a)gmail.com> - 8.4.62-1
- Update to 8.4.62.
diff --git a/version-scan.sh b/version-scan.sh
index afc9be8..d6732c0 100755
--- a/version-scan.sh
+++ b/version-scan.sh
@@ -6,7 +6,7 @@ SOURCES=$( spectool -l -s 0 $SPECFILE )
DLURL=$( echo $SOURCES | grep -E '^Source0:\s+' | sed 's/^Source0://' )
SOURCEFILE=$(pwd)/$( echo $DLURL | sed 's/http.*\///' )
TEMPDIR=$( mktemp -d -t unifi_XXXXXXXXXX )
-TEMPLIBDIR=$TEMPDIR/UniFi/lib
+TEMPLIBDIR=$TEMPDIR/UniFi/lib/local
VERSION=$( grep -E '^Version:\s+' $SPECFILE | sed 's/^Version://' )
VERSIONFILE=$TEMPDIR/provides.list
if [ x"$VERSION" = x ]; then
@@ -45,6 +45,7 @@ for file in `ls $TEMPLIBDIR/*.jar`; do
if [ `echo $file | grep -` ]; then
version=`echo $file | sed -e 's/\.jar$//' -e 's/.*-//' -e
's/\.RELEASE//'`
determination="filename"
+ echo "Jar: $file, Version: $version"
fi
# if not, check to see if implementation-version is set, if so, go with it
@@ -60,10 +61,10 @@ for file in `ls $TEMPLIBDIR/*.jar`; do
fi
library=`echo $file | sed -e 's/.*\///' -e 's/\.jar$//' -e
"s/-$version//" -e 's/\.RELEASE//'`
-
+ #echo $library
# create output for RPM packaging
echo "Provides: bundled(${library}) = ${version}" >>
$VERSIONFILE
-
+
done
echo "Created provides list in $VERSIONFILE."