[telegram-desktop/f31: 2/2] Updated to version 2.1.12.
by Vitaly Zaitsev
commit 8ff880273f202823ef444cd85073434c22e89c1f
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu Jun 18 11:46:22 2020 +0200
Updated to version 2.1.12.
.gitignore | 1 +
sources | 2 +-
telegram-desktop.spec | 21 ++++++++++++++++-----
3 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7316ad..166691b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -143,3 +143,4 @@
/tdesktop-2.1.7-full.tar.gz
/tdesktop-2.1.10-full.tar.gz
/tdesktop-2.1.11-full.tar.gz
+/tdesktop-2.1.12-full.tar.gz
diff --git a/sources b/sources
index f5b6096..5e659cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-2.1.11-full.tar.gz) = 9f2fba2814a5ab64f946913e32fce66dbc842d9607cbaee00994689ef6a661a04c2a8de5e075fc532e7d8926b51432c06c2b1510b019d729eef40da373d91d42
+SHA512 (tdesktop-2.1.12-full.tar.gz) = 961f7e4900f782d58d5d1b1045590a7029777c3daa8d26f47a61663de9ab0c3c3cdfa7507c0710af2fb231e480ffe67de0bcbd61b72acb751ae8133b73d86cff
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 84c19b9..9e1619a 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -1,6 +1,7 @@
# Build conditionals (with - OFF, without - ON)...
%bcond_without rlottie
%bcond_without ipo
+%bcond_with gtk3
%bcond_with clang
# Telegram Desktop's constants...
@@ -20,8 +21,8 @@
%endif
Name: telegram-desktop
-Version: 2.1.11
-Release: 2%{?dist}
+Version: 2.1.12
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball;
@@ -40,6 +41,7 @@ Requires: hicolor-icon-theme
Requires: open-sans-fonts
# Short alias for the main package...
+Provides: telegram = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: telegram%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
# Telegram Desktop require patched version of rlottie since 1.8.0.
@@ -92,6 +94,11 @@ BuildRequires: clang
BuildRequires: llvm
%endif
+%if %{with gtk3}
+BuildRequires: gtk3-devel
+Requires: gtk3%{?_isa}
+%endif
+
%description
Telegram is a messaging app with a focus on speed and security, it’s super
fast, simple and free. You can use Telegram on all your devices at the same
@@ -158,7 +165,11 @@ pushd %{_target_platform}
-DDESKTOP_APP_USE_GLIBC_WRAPS:BOOL=OFF \
-DDESKTOP_APP_DISABLE_CRASH_REPORTS:BOOL=ON \
-DTDESKTOP_USE_PACKAGED_TGVOIP:BOOL=ON \
+%if %{with gtk3}
+ -DTDESKTOP_DISABLE_GTK_INTEGRATION:BOOL=OFF \
+%else
-DTDESKTOP_DISABLE_GTK_INTEGRATION:BOOL=ON \
+%endif
-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME:BOOL=ON \
-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION:BOOL=ON \
-DTDESKTOP_USE_FONTCONFIG_FALLBACK:BOOL=OFF \
@@ -183,11 +194,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.appdata.xml
%changelog
+* Thu Jun 18 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.1.12-1
+- Updated to version 2.1.12.
+
* Mon Jun 15 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.1.11-2
- Rebuilt due to Qt 5.14.2 update.
* Mon Jun 08 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.1.11-1
- Updated to version 2.1.11.
-
-* Sat Jun 06 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.1.10-1
-- Updated to version 2.1.10.
4 years, 5 months
[VirtualBox] Fix (#5677) https://docs.pagure.org/packaging-guidelines/Packaging%3AScriptlets.html (On upgrade
by Sérgio M. Basto
commit f066d2fa7aa2b6f62ef5332710e8a0ea017c9a3c
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Jun 17 18:21:43 2020 +0100
Fix (#5677)
https://docs.pagure.org/packaging-guidelines/Packaging%3AScriptlets.html (On
upgrade, the scripts are run in the following order)
VirtualBox.spec | 10 +++++++++-
update_vbox.sh | 6 ++++--
2 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 9f8fa42..28545f3 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -46,7 +46,7 @@
Name: VirtualBox
Version: 6.1.10
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -675,6 +675,9 @@ fi
%postun server
%systemd_postun_with_restart vboxdrv.service
+%triggerun -- VirtualBox-server < 0:6.1.10-4
+/usr/bin/systemctl --no-reload preset vboxdrv.service || :
+
# Need review, I don't know the rules of Icon Cache, mimeinfo and Desktop databases for epel 8
%if 0%{?rhel} && 0%{?rhel} < 8
%post
@@ -890,6 +893,11 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Wed Jun 17 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.10-4
+- Fix (#5677)
+ https://docs.pagure.org/packaging-guidelines/Packaging%3AScriptlets.html (On
+ upgrade, the scripts are run in the following order)
+
* Sat Jun 13 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.10-3
- Syncronize with virtualbox-guest-additions from Fedora
- Add a vboxclient.service which runs VBoxClient --vwsvga when using the
diff --git a/update_vbox.sh b/update_vbox.sh
index c92d9ad..dce3364 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,8 +1,7 @@
VERSION=6.1.10
-REL=3
+REL=4
RAWHIDE=33
REPOS="f32 f31 el8 el7"
-REPOS="el8 el7"
if [ -z "$1" ]
then
stage=0
@@ -27,9 +26,12 @@ fi
if test $stage -le 1
then
echo STAGE 1
+if test $REL -eq 1
+then
echo Press enter to upload sources; read dummy;
rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 ./UserManual.pdf
rfpkg ci -c && git show
+fi
echo Press enter to push and build on rawhide; read dummy;
rfpkg push && rfpkg build --nowait
fi
4 years, 5 months
[VirtualBox] We need not forget that EL7 says virtualization is kvm !?
by Sérgio M. Basto
commit bd3d1ba2563f73a7c21d98958f4296143b8c139d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Jun 18 00:26:11 2020 +0100
We need not forget that EL7 says virtualization is kvm !?
vboxclient.service | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/vboxclient.service b/vboxclient.service
index 3fabb54..32f3b45 100644
--- a/vboxclient.service
+++ b/vboxclient.service
@@ -1,5 +1,7 @@
[Unit]
Description=VirtualBox guest VMSVGA resize client
+#RHEL7 says that Virtualization is kvm!?
+ConditionVirtualization=|kvm
ConditionVirtualization=|oracle
[Service]
4 years, 5 months
[unifi] Add automated bundled provides script proided by Alex Jacocks.
by Richard Shaw
commit d5f80cf13577bb9b3e936c4d3e8721c605c505df
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Wed Jun 17 07:11:28 2020 -0500
Add automated bundled provides script proided by Alex Jacocks.
unifi.spec | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
version-scan.sh | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 143 insertions(+), 9 deletions(-)
---
diff --git a/unifi.spec b/unifi.spec
index e251465..1395435 100644
--- a/unifi.spec
+++ b/unifi.spec
@@ -46,16 +46,26 @@ Conflicts: unifi-controller
Provides: bundled(lato-fonts-web)
Provides: bundled(ubnt-fonts)
-# Bundled java ;obraries
-# This needs to be automated!
-
+# Bundled java libraries
+### BEGIN AUTOMATION ###
+Provides: bundled(ace) = 9999
+Provides: bundled(animal-sniffer-annotations) = 1.17
Provides: bundled(annotations) = 3.0.1
+Provides: bundled(api-common) = 1.7.0
+Provides: bundled(apigateway-generic-java-sdk) = 1.3
+Provides: bundled(auto-value) = 1.6.2
+Provides: bundled(aws-iot-device-sdk-java) = 1.2.0
Provides: bundled(aws-java-sdk-cloudwatch) = 1.11.409
Provides: bundled(aws-java-sdk-core) = 1.11.409
Provides: bundled(aws-java-sdk-s3) = 1.11.409
+Provides: bundled(bcpkix-jdk15on) = 1.60
+Provides: bundled(bcprov-jdk15on) = 1.60
+Provides: bundled(checker-qual) = 2.5.7
+Provides: bundled(classmate) = 1.5.0
+Provides: bundled(coloring) = 1.0
Provides: bundled(commons-beanutils) = 1.9.3
Provides: bundled(commons-codec) = 1.11
-Provides: bundled(commons-httpclient) = 3.1-2
+Provides: bundled(commons-httpclient-3.1-atlassian) = 2
Provides: bundled(commons-httpclient-contrib) = 3.1
Provides: bundled(commons-io) = 2.6
Provides: bundled(commons-lang) = 2.6
@@ -67,41 +77,92 @@ Provides: bundled(compiler) = 0.9.5
Provides: bundled(cron4j) = 2.2.5
Provides: bundled(dom4j) = 1.6.1
Provides: bundled(ecj) = 4.6.1
+Provides: bundled(eddsa) = 0.3.0
+Provides: bundled(error_prone_annotations) = 2.3.1
+Provides: bundled(gax) = 1.31.0
+Provides: bundled(google-api-client) = 1.26.0
+Provides: bundled(google-api-services-drive-v3-rev20180830) = 1.26.0
+Provides: bundled(google-api-services-storage-v1-rev20181013) = 1.26.0
+Provides: bundled(google-auth-library-credentials) = 0.11.0
+Provides: bundled(google-auth-library-oauth2-http) = 0.11.0
+Provides: bundled(google-cloud-core) = 1.44.0
+Provides: bundled(google-cloud-core-http) = 1.44.0
+Provides: bundled(google-cloud-storage) = 1.44.0
+Provides: bundled(google-http-client) = 1.26.0
+Provides: bundled(google-http-client-appengine) = 1.26.0
+Provides: bundled(google-http-client-gson) = 1.26.0
+Provides: bundled(google-http-client-jackson) = 1.26.0
+Provides: bundled(google-http-client-jackson2) = 1.26.0
+Provides: bundled(google-http-client-jdo) = 1.26.0
+Provides: bundled(google-oauth-client) = 1.26.0
Provides: bundled(gson) = 2.8.5
-Provides: bundled(guava) = 26.0
+Provides: bundled(guava-26.0) = jre
Provides: bundled(httpclient) = 4.5.6
Provides: bundled(httpcore) = 4.4.10
+Provides: bundled(j2objc-annotations) = 1.3
Provides: bundled(jackson-annotations) = 2.9.7
Provides: bundled(jackson-core) = 2.9.7
Provides: bundled(jackson-databind) = 2.9.7
+Provides: bundled(java-ipv6) = 0.17
+Provides: bundled(java-semver) = 0.9.0
+Provides: bundled(javax.mail) = 1.6.2
Provides: bundled(jedis) = 2.9.0
+Provides: bundled(jenetics) = 4.2.0
Provides: bundled(jmdns) = 3.4.1
Provides: bundled(joda-time) = 2.10.1
Provides: bundled(jorbis) = 0.0.17
+Provides: bundled(json) = 20180813
+Provides: bundled(jsr305) = 3.0.2
Provides: bundled(jstl) = 1.2
Provides: bundled(jstun) = 0.7.4
Provides: bundled(jul-to-slf4j) = 1.7.25
-Provides: bundled(log4j) = 2.11.1
+Provides: bundled(log4j-api) = 2.11.1
+Provides: bundled(log4j-core) = 2.11.1
+Provides: bundled(log4j-slf4j-impl) = 2.11.1
Provides: bundled(mongo-java-driver) = 3.4.3
-Provides: bundled(radclient4)
+Provides: bundled(openssh) = 1.0
+Provides: bundled(org.eclipse.paho.client.mqttv3) = 1.1.0
+Provides: bundled(owasp-java-html-sanitizer) = 20190503.1
+Provides: bundled(protobuf-java) = 3.6.1
+Provides: bundled(protobuf-java-util) = 3.6.1
+Provides: bundled(proto-google-common-protos) = 1.12.0
+Provides: bundled(proto-google-iam-v1) = 0.12.0
+Provides: bundled(radclient4) = 0.12.0
+Provides: bundled(servo-aws) = 0.12.25
Provides: bundled(servo-core) = 0.12.25
Provides: bundled(servo-graphite) = 0.12.25
Provides: bundled(slf4j-api) = 1.7.25
-Provides: bundled(slf4j-log4j12) = 1.7.25
Provides: bundled(snappy-java) = 1.1.7.2
+Provides: bundled(spectator-api) = 0.76.0
+Provides: bundled(spring-aop) = 5.1.2
Provides: bundled(spring-beans) = 5.1.2
Provides: bundled(spring-context) = 5.1.2
Provides: bundled(spring-core) = 5.1.2
Provides: bundled(spring-expression) = 5.1.2
+Provides: bundled(springfox-core) = 2.9.2
+Provides: bundled(springfox-schema) = 2.9.2
+Provides: bundled(springfox-spi) = 2.9.2
+Provides: bundled(springfox-spring-web) = 2.9.2
+Provides: bundled(springfox-swagger2) = 2.9.2
+Provides: bundled(springfox-swagger-common) = 2.9.2
+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.2
+Provides: bundled(spring-web) = 5.1.2
+Provides: bundled(spring-webmvc) = 5.1.5
Provides: bundled(sshj) = 0.26.0
+Provides: bundled(swagger-annotations) = 1.5.20
+Provides: bundled(swagger-models) = 1.5.20
Provides: bundled(tomcat-annotations-api) = 8.5.34
-Provides: bundled(tomcat-embed-core) = 8.5.34
+Provides: bundled(tomcat-embed-core) = 8.5.34
Provides: bundled(tomcat-embed-el) = 8.5.34
Provides: bundled(tomcat-embed-jasper) = 8.5.34
Provides: bundled(tomcat-embed-logging-juli) = 8.5.2
Provides: bundled(tomcat-embed-logging-log4j) = 8.5.2
+Provides: bundled(tomcat-embed-websocket) = 8.5.34
Provides: bundled(urlrewritefilter) = 4.0.4
+### END AUTOMATION ###
# So you can prevent automatic updates.
%if 0%{?fedora}
diff --git a/version-scan.sh b/version-scan.sh
new file mode 100755
index 0000000..3600c8d
--- /dev/null
+++ b/version-scan.sh
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+SPECFILE=$(pwd)/unifi.spec
+
+SOURCES=$( spectool -l -s 0 $SPECFILE )
+DLURL=$( echo $SOURCES | egrep '^Source0:\s+' | sed 's/^Source0://' )
+SOURCEFILE=$(pwd)/$( echo $DLURL | sed 's/http.*\///' )
+TEMPDIR=$( mktemp -d -t unifi_XXXXXXXXXX )
+TEMPLIBDIR=$TEMPDIR/UniFi/lib
+VERSION=$( egrep '^Version:\s+' $SPECFILE | sed 's/^Version://' )
+VERSIONFILE=$TEMPDIR/provides.list
+if [ x"$VERSION" = x ]; then
+ echo "Unable to determine the version to scan from $SPECFILE. Exiting!"
+ exit 1
+fi
+
+echo DLURL is $DLURL
+echo SOURCEFILE is $SOURCEFILE
+echo TEMPDIR is $TEMPDIR
+echo TEMPLIBDIR is $TEMPLIBDIR
+echo VERSION is $VERSION
+
+if [ ! -x /usr/bin/unzip ]; then
+ echo "Unzip is required for this script. Exiting!"
+ exit 2
+fi
+
+if [ ! -f $SOURCEFILE ]; then
+ echo "Unable to find the required sourcefiles. Exiting!"
+ exit 3
+fi
+
+echo -n "Extracting $SOURCEFILE to $TEMPDIR..."
+unzip -q $SOURCEFILE -d $TEMPDIR
+if [ $? -ne 0 ]; then
+ echo "Failed to extract $SOURCEFILE to $TEMPDIR. Exiting!"
+ exit 4
+fi
+echo "done!"
+
+for file in `ls $TEMPLIBDIR/*.jar`; do
+
+ # try the file name
+ # get just the version, which is assumed to be -#[.#]+.jar
+ if [ `echo $file | grep -` ]; then
+ version=`echo $file | sed -e 's/\.jar$//' -e 's/.*-//' -e 's/\.RELEASE//'`
+ determination="filename"
+ fi
+
+ # if not, check to see if implementation-version is set, if so, go with it
+ if [ x${version} = x ]; then
+ version=`unzip -p $file META-INF/MANIFEST.MF | grep Implementation-Version | sed -e 's/^Implementation-Version: //' -e 's/\r//'`
+ determination="manifest"
+ fi
+
+ # if not, just give up, and say '9999'
+ if [ x${version} = x ]; then
+ version='9999'
+ determination="fallback"
+ fi
+
+ library=`echo $file | sed -e 's/.*\///' -e 's/\.jar$//' -e "s/-$version//" -e 's/\.RELEASE//'`
+
+ # create output for RPM packaging
+ echo "Provides: bundled(${library}) = ${version}" >> $VERSIONFILE
+
+done
+
+echo "Created provides list in $VERSIONFILE."
+
+echo -n "Updating $SPECFILE with jar library versions..."
+sed -i -n -e '1,/^### BEGIN AUTOMATION ###$/p' -e '/^### BEGIN AUTOMATION ###$/r '$VERSIONFILE -e '/^### END AUTOMATION ###$/,$p' $SPECFILE
+echo "done!"
4 years, 5 months
