[telegram-desktop] Revert "Update to 4.8.3."
by Nicolas Chauvet
commit e3154f14a16a6c520bf5caabff93dc4362a6cdfe
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jun 8 15:11:42 2023 +0200
Revert "Update to 4.8.3."
This reverts commit 5ab26a561d57dfb5a4bef0fabe7c82ee3d985e17.
sources | 2 +-
telegram-desktop.spec | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/sources b/sources
index 35d0aa8..01687a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-4.8.3-full.tar.gz) = 11fdd39319d1fdae07094d0ab2cb919355015bee14567d88daf98f9e5332bfee7a938415800397e6f24224e97f6425fe0a1d7549d7de14b63f84ab7cb7741872
+SHA512 (tdesktop-4.8.1-full.tar.gz) = 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 9453c80..32e8e50 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -5,8 +5,8 @@
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
Name: telegram-desktop
-Version: 4.8.3
-Release: 1%{?dist}
+Version: 4.8.1
+Release: 3%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPL-3.0-or-later with OpenSSL exception -- main tarball;
@@ -159,9 +159,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_metainfodir}/*.metainfo.xml
%changelog
-* Sat Jun 03 2023 Vasiliy Glazov <vascom2(a)gmail.com> - 4.8.3-1
-- Update to 4.8.3
-
* Wed May 31 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 4.8.1-3
- Fixed issues with voice and video calls.
11 months, 2 weeks
[unifi/el8] Update to 7.4.156.
by Richard Shaw
Summary of changes:
d1f1a4b... Update to 7.4.156. (*)
(*) This commit already existed in another branch; no separate mail sent
11 months, 2 weeks
[unifi/el9] Update to 7.4.156.
by Richard Shaw
Summary of changes:
d1f1a4b... Update to 7.4.156. (*)
(*) This commit already existed in another branch; no separate mail sent
11 months, 2 weeks
[unifi/f37] Update to 7.4.156.
by Richard Shaw
Summary of changes:
d1f1a4b... Update to 7.4.156. (*)
(*) This commit already existed in another branch; no separate mail sent
11 months, 2 weeks
[unifi/f38] Update to 7.4.156.
by Richard Shaw
Summary of changes:
d1f1a4b... Update to 7.4.156. (*)
(*) This commit already existed in another branch; no separate mail sent
11 months, 2 weeks
[unifi] Update to 7.4.156.
by Richard Shaw
commit d1f1a4b8c73703b621d7ef884b6f925c5eb2d3da
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Thu Jun 8 06:30:52 2023 -0500
Update to 7.4.156.
https://community.ui.com/releases/UniFi-Network-Application-7-4-156/15ac6...
.gitignore | 1 +
sources | 2 +-
unifi.spec | 122 +++++++++++++++++++++++++++++--------------------------------
3 files changed, 60 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 209627c..6380b6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
/UniFi-7.2.95.unix.zip
/UniFi-7.3.76.unix.zip
/UniFi-7.3.83.unix.zip
+/UniFi-7.4.156.unix.zip
diff --git a/sources b/sources
index b3e822d..c3a95e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (UniFi-7.3.83.unix.zip) = ae7bd0e5deff9fceb831be7d652c333d06f1b2a9b40411e1e72607558b01b33814590601c991742a7627eb7a15ec33d5ea0ca1f8d7d2103f348db592f61aaca7
+SHA512 (UniFi-7.4.156.unix.zip) = 903695360ec06f30fcf9133540cf0bcbc134a67c641e9ea75acc1fd1d34bbc17b80f024bdce1a217454816117c5e08400c8a2e5a3ce2b9cf5b76b39a4b4bb3be
diff --git a/unifi.spec b/unifi.spec
index bb5048c..d0c60e4 100644
--- a/unifi.spec
+++ b/unifi.spec
@@ -4,7 +4,7 @@
%global __strip /bin/true
Name: unifi
-Version: 7.3.83
+Version: 7.4.156
Release: 1%{?dist}
Summary: Ubiquiti UniFi controller
@@ -53,30 +53,24 @@ Provides: bundled(analytics-api) = 1.2.1
Provides: bundled(analytics-client) = 1.2.1
Provides: bundled(analytics-privacy) = 1.2.1
Provides: bundled(annotations) = 3.0.1
-Provides: bundled(antlr4-runtime) = 4.7.2
Provides: bundled(api-common) = 1.7.0
Provides: bundled(apigateway-generic-java-sdk) = 1.3
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(byte-buddy) = 1.8.12
+Provides: bundled(bson) = 4.6.1
+Provides: bundled(bson-record-codec) = 4.6.1
Provides: bundled(checker-qual) = 3.12.0
-Provides: bundled(classgraph) = 4.8.59
-Provides: bundled(classmate) = 1.4.0
+Provides: bundled(classmate) = 1.5.1
Provides: bundled(coloring) = 1.0
Provides: bundled(commons-beanutils) = 1.9.2
-Provides: bundled(commons-codec) = 1.11
-Provides: bundled(commons-dbcp2) = 2.7.0
-Provides: bundled(commons-httpclient-3.1-atlassian) = 2
-Provides: bundled(commons-httpclient-contrib) = 3.1
+Provides: bundled(commons-codec) = 1.15
Provides: bundled(commons-io) = 2.11.0
Provides: bundled(commons-lang3) = 3.12.0
Provides: bundled(commons-logging) = 1.2
Provides: bundled(commons-net) = 3.8.0
-Provides: bundled(commons-pool2) = 2.7.0
Provides: bundled(commons-text) = 1.10.0
Provides: bundled(commons-validator) = 1.6
Provides: bundled(compiler) = 0.9.6
@@ -87,7 +81,6 @@ Provides: bundled(eddsa) = 0.2.0
Provides: bundled(error_prone_annotations) = 2.7.1
Provides: bundled(failureaccess) = 1.0.1
Provides: bundled(gax) = 1.31.0
-Provides: bundled(geantyref) = 1.3.11
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-rev135) = 1.24.1
@@ -103,23 +96,22 @@ Provides: bundled(google-http-client-jackson) = 1.24.1
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(graphql-java) = 13.0
-Provides: bundled(gson) = 2.8.5
-Provides: bundled(gson-java8-datatype) = 1.1.0
+Provides: bundled(gson) = 2.9.0
Provides: bundled(guava-31.0.1) = jre
-Provides: bundled(hibernate-validator) = 6.1.2.Final
+Provides: bundled(hibernate-validator) = 6.2.3.Final
Provides: bundled(httpclient) = 4.5.13
-Provides: bundled(httpcore) = 4.4.13
+Provides: bundled(httpcore) = 4.4.15
+Provides: bundled(httpmime) = 4.5.13
Provides: bundled(j2objc-annotations) = 1.3
-Provides: bundled(jackson-annotations) = 2.13.1
-Provides: bundled(jackson-core) = 2.13.1
-Provides: bundled(jackson-databind) = 2.13.1
-Provides: bundled(jackson-datatype-jdk8) = 2.13.1
-Provides: bundled(jackson-datatype-jsr310) = 2.13.1
-Provides: bundled(jackson-module-parameter-names) = 2.13.1
+Provides: bundled(jackson-annotations) = 2.13.3
+Provides: bundled(jackson-core) = 2.13.3
+Provides: bundled(jackson-databind) = 2.13.3
+Provides: bundled(jackson-datatype-jdk8) = 2.13.3
+Provides: bundled(jackson-datatype-jsr310) = 2.13.3
+Provides: bundled(jackson-module-parameter-names) = 2.13.3
+Provides: bundled(jakarta.annotation-api) = 1.3.5
Provides: bundled(jakarta.validation-api) = 2.0.2
Provides: bundled(java-binme) = 1.0
-Provides: bundled(java-dataloader) = 2.1.1
Provides: bundled(java-ipv6) = 0.17
Provides: bundled(java-semver) = 0.9.0
Provides: bundled(java-ucp) = 1.1
@@ -128,13 +120,12 @@ Provides: bundled(javax.mail) = 1.6.2
Provides: bundled(jaxb-api) = 2.3.0
Provides: bundled(jaxb-core) = 2.3.0.1
Provides: bundled(jaxb-impl) = 2.3.0.1
-Provides: bundled(jboss-logging) = 3.3.2.Final
+Provides: bundled(jboss-logging) = 3.4.3.Final
Provides: bundled(jcl-over-slf4j) = 1.7.36
Provides: bundled(jenetics) = 4.2.0
Provides: bundled(jmdns) = 3.4.1
Provides: bundled(jna) = 5.9.0
Provides: bundled(joda-time) = 2.10.4
-Provides: bundled(jorbis) = 0.0.17
Provides: bundled(json) = 20190722
Provides: bundled(jsr305) = 3.0.2
Provides: bundled(jstl) = 1.2
@@ -142,10 +133,13 @@ Provides: bundled(jstun) = 0.7.4
Provides: bundled(jul-to-slf4j) = 1.7.36
Provides: bundled(lazysodium-java) = 5.1.2
Provides: bundled(log4j-api) = 2.17.2
-Provides: bundled(log4j-core) = 2.17.2
-Provides: bundled(log4j-slf4j-impl) = 2.17.2
+Provides: bundled(log4j-to-slf4j) = 2.17.2
+Provides: bundled(logback-classic) = 1.2.11
+Provides: bundled(logback-core) = 1.2.11
Provides: bundled(minimal-json) = 0.9.5
-Provides: bundled(mongo-java-driver) = 3.4.3
+Provides: bundled(mongodb-driver-core) = 4.6.1
+Provides: bundled(mongodb-driver-legacy) = 4.6.1
+Provides: bundled(mongodb-driver-sync) = 4.6.1
Provides: bundled(openssh) = 1.0
Provides: bundled(org.eclipse.paho.client.mqttv3) = 1.1.0
Provides: bundled(owasp-java-html-sanitizer) = 20190503.1
@@ -154,45 +148,41 @@ 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(radclient4) = 0.12.0
-Provides: bundled(reactive-streams) = 1.0.3
-Provides: bundled(reactor-core) = 3.4.0
+Provides: bundled(reactive-streams) = 1.0.4
+Provides: bundled(reactor-core) = 3.4.21
Provides: bundled(resource-loader) = 2.0.2
-Provides: bundled(servo-aws) = 0.13.0
-Provides: bundled(servo-core) = 0.13.0
-Provides: bundled(servo-graphite) = 0.13.0
Provides: bundled(slf4j-api) = 1.7.36
+Provides: bundled(snakeyaml) = 1.30
Provides: bundled(snappy-java) = 1.1.8.4
-Provides: bundled(spectator-api) = 0.88.0
-Provides: bundled(spqr) = 0.10.1
-Provides: bundled(spring-aop) = 5.3.18
-Provides: bundled(spring-beans) = 5.3.18
-Provides: bundled(spring-context) = 5.3.18
-Provides: bundled(spring-core) = 5.3.18
-Provides: bundled(spring-data-commons) = 1.13.23
-Provides: bundled(spring-data-mongodb) = 1.10.23
-Provides: bundled(spring-expression) = 5.3.18
-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.3.18
-Provides: bundled(spring-tx) = 5.3.18
-Provides: bundled(spring-web) = 5.3.18
-Provides: bundled(spring-webmvc) = 5.3.18
-Provides: bundled(spring-websocket) = 5.3.18
+Provides: bundled(spring-aop) = 5.3.22
+Provides: bundled(spring-beans) = 5.3.22
+Provides: bundled(spring-boot) = 2.7.2
+Provides: bundled(spring-boot-autoconfigure) = 2.7.2
+Provides: bundled(spring-boot-starter) = 2.7.2
+Provides: bundled(spring-boot-starter-data-mongodb) = 2.7.2
+Provides: bundled(spring-boot-starter-json) = 2.7.2
+Provides: bundled(spring-boot-starter-logging) = 2.7.2
+Provides: bundled(spring-boot-starter-tomcat) = 2.7.2
+Provides: bundled(spring-boot-starter-validation) = 2.7.2
+Provides: bundled(spring-boot-starter-web) = 2.7.2
+Provides: bundled(spring-boot-starter-websocket) = 2.7.2
+Provides: bundled(spring-context) = 5.3.22
+Provides: bundled(spring-core) = 5.3.22
+Provides: bundled(spring-data-commons) = 2.7.2
+Provides: bundled(spring-data-mongodb) = 3.4.2
+Provides: bundled(spring-expression) = 5.3.22
+Provides: bundled(spring-messaging) = 5.3.22
+Provides: bundled(spring-tx) = 5.3.22
+Provides: bundled(spring-web) = 5.3.22
+Provides: bundled(spring-webmvc) = 5.3.22
+Provides: bundled(spring-websocket) = 5.3.22
Provides: bundled(sshj) = 0.27.0
-Provides: bundled(swagger-annotations) = 1.5.20
-Provides: bundled(swagger-models) = 1.5.20
-Provides: bundled(tomcat-annotations-api) = 9.0.59
-Provides: bundled(tomcat-embed-core) = 9.0.59
-Provides: bundled(tomcat-embed-el) = 9.0.59
-Provides: bundled(tomcat-embed-jasper) = 9.0.59
-Provides: bundled(tomcat-embed-websocket) = 9.0.59
+Provides: bundled(tomcat-annotations-api) = 9.0.65
+Provides: bundled(tomcat-embed-core) = 9.0.65
+Provides: bundled(tomcat-embed-el) = 9.0.65
+Provides: bundled(tomcat-embed-jasper) = 9.0.65
+Provides: bundled(tomcat-embed-programmatic) = 9.0.65
+Provides: bundled(tomcat-embed-websocket) = 9.0.65
Provides: bundled(urlrewritefilter) = 4.0.4
### END AUTOMATION ###
@@ -368,6 +358,10 @@ fi
%changelog
+* Thu Jun 08 2023 Richard Shaw <hobbes1069(a)gmail.com> - 7.4.156-1
+- Update to 7.4.156.
+ https://community.ui.com/releases/UniFi-Network-Application-7-4-156/15ac6...
+
* Tue Feb 07 2023 Richard Shaw <hobbes1069(a)gmail.com> - 7.3.83-1
- Update to 7.3.83, for detail see:
https://community.ui.com/releases/UniFi-Network-Application-7-3-83/88f5ff...
11 months, 2 weeks
[xv] Switch upstream to https://github.com/jasper-software/xv (#6702)
by Paul Howarth
commit 162a7e222881abd583d2d402e545ed81020f27e7
Author: Paul Howarth <paul(a)city-fan.org>
Date: Thu Jun 8 10:24:27 2023 +0100
Switch upstream to https://github.com/jasper-software/xv (#6702)
This also enables us to add webp image format support.
.gitignore | 11 +-
sources | 7 +-
xv-3.10a-20220127-jasper.patch | 2491 -----------------------
xv-3.10a-LDFLAGS.patch | 35 -
xv-3.10a-c99isms.patch | 105 -
xv-3.10a-cleanup.patch | 86 -
xv-3.10a-corrupt-GIF.patch | 46 -
xv-3.10a-dirw.patch | 28 -
xv-3.10a-enhancements.20070520-20081216.diff | 293 ---
xv-3.10a-format.patch | 13 -
xv-3.10a-gcc10.patch | 56 -
xv-3.10a-jpeg8.patch | 61 -
xv-3.10a-libjpeg-messages.patch | 99 -
xv-3.10a-libpng15.patch | 520 -----
xv-3.10a-multi-APP1.patch | 35 -
xv-3.10a-namemax.patch | 82 -
xv-3.10a-png-itxt.patch | 16 -
xv-3.10a-signal.patch | 341 ----
xv-3.10a-smooth-fix2.patch | 87 -
xv-3.10a-ticks.patch | 48 -
xv-3.10a-utf8-docs.patch | 320 ---
xv-3.10a-xvcut.patch | 29 -
xv-FLmask.v2.1.patch | 2730 --------------------------
xv-jumbo-20070520-makefile.patch | 140 --
xv-wait.patch | 11 -
xv.spec | 228 +--
26 files changed, 49 insertions(+), 7869 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e87065f..4e38a26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-xv-3.10a-jumbo-patches-20070520.tar.gz
-xv-3.10a.tar.gz
-xv-non-english-Xman-pages.tar.bz2
-xv.png
-xvman310a-html.tar.gz
+/xv-3.10a.tar.gz
+/xvman310a-html.tar.gz
+/xv-3.10a-jumbo-patches-20070520.tar.gz
+/xv-non-english-Xman-pages.tar.bz2
+/xv.png
+/v4.1.1.tar.gz
diff --git a/sources b/sources
index db65299..64931bb 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,2 @@
-9fb2d0ec320498105cafeba38a588472 xv-3.10a-jumbo-patches-20070520.tar.gz
-2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz
-4e5a6582ad76974309ca8bf8fb56b671 xv-non-english-Xman-pages.tar.bz2
-b08c658ae55f805d5671d7d1bc9142c1 xv.png
-5455638774a6cd2563d8e94fa58f3548 xvman310a-html.tar.gz
+SHA512 (v4.1.1.tar.gz) = 100202efe5f26bf4483ac3fb18997ff54db2a18c9b365cce1f388308b2dca38370d246ce0ddfa2a1e5581070262ba0397dea58cbaba5045242e05e4b44d3a3a0
+SHA512 (xv.png) = ed4d00d5dfadab690a8befe78d3a280f745963399360f31fd8dfe1a8b87af0e9eb3b93028f91745b11ecc6cd9e84b2f5df48b429fc768eab31f2bd127d466f14
diff --git a/xv.spec b/xv.spec
index e1011f8..04a9af7 100644
--- a/xv.spec
+++ b/xv.spec
@@ -1,9 +1,6 @@
-%global vprog 3.10a
-%global vjumbo 20070520
-
Name: xv
-Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 43%{?dist}
+Version: 4.1.1
+Release: 1%{?dist}
Summary: Interactive image display program for X
Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
@@ -14,46 +11,23 @@ Summary(ru.UTF-8): Программа для просмотра и преобр
Summary(tr.UTF-8): X tabanlı resim görüntüleyici
Summary(uk.UTF-8): Програма для перегляду та перетворення файлів зображень для X
License: Shareware
-URL: http://www.trilon.com/xv/xv.html
-Source0: ftp://ftp.trilon.com/pub/xv/%{name}-%{vprog}.tar.gz
-Source1: http://downloads.sourceforge.net/png-mng/%{name}-%{vprog}-jumbo-patches-%...
+URL: https://github.com/jasper-software/xv
+Source0: https://github.com/jasper-software/xv/archive/refs/tags/v%{version}.tar.gz
Source2: DISTRIBUTE.txt
-Source3: %{name}.desktop
-Source4: %{name}.png
-Source5: ftp://ftp.trilon.com/pub/xv/xvman310a-html.tar.gz
-Source6: xv-non-english-Xman-pages.tar.bz2
-Patch0: xv-jumbo-20070520-makefile.patch
-Patch1: http://www.gregroelofs.com/code/xv-3.10a-enhancements.20070520-20081216.diff
-Patch2: xv-3.10a-cleanup.patch
-Patch3: xv-FLmask.v2.1.patch
-Patch4: xv-wait.patch
-Patch5: xv-3.10a-libpng15.patch
-Patch6: xv-3.10a-namemax.patch
-Patch7: xv-3.10a-xvcut.patch
-Patch8: xv-3.10a-format.patch
-Patch9: xv-3.10a-png-itxt.patch
-Patch10: xv-3.10a-smooth-fix2.patch
-Patch11: xv-3.10a-signal.patch
-Patch12: xv-3.10a-gcc10.patch
-Patch13: xv-3.10a-20220127-jasper.patch
-Patch14: xv-3.10a-c99isms.patch
-Patch15: xv-3.10a-utf8-docs.patch
-Patch16: xv-3.10a-LDFLAGS.patch
-Patch17: xv-3.10a-multi-APP1.patch
-Patch18: xv-3.10a-corrupt-GIF.patch
-Patch19: xv-3.10a-libjpeg-messages.patch
-Patch20: xv-3.10a-dirw.patch
-Patch21: xv-3.10a-jpeg8.patch
-Patch22: xv-3.10a-ticks.patch
+Source3: xv.desktop
+Source4: xv.png
+BuildRequires: cmake >= 3.12
+BuildRequires: coreutils
+BuildRequires: desktop-file-utils
BuildRequires: gcc
-BuildRequires: libtiff-devel
-BuildRequires: libpng-devel
BuildRequires: jasper-devel
-BuildRequires: desktop-file-utils
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
+BuildRequires: libwebp-devel
BuildRequires: libX11-devel
BuildRequires: libXt-devel
-
-
+# Require hicolor-icon-theme for ownership of %%{_datadir}/icons/hicolor/48x48/apps/
Requires: hicolor-icon-theme
%description
@@ -128,169 +102,45 @@ Manuals in various formats for the xv image viewer, plus technical details
of the various image file formats supported.
%prep
-%setup -q -n %{name}-%{vprog} -b 1 -a 5 -a 6
-
-# Apply 20070520 jumbo enhancement patch, bundled with %%{SOURCE1}
-patch -p1 < ../%{name}-%{vprog}-jumbo-fix-enh-patch-%{vjumbo}.txt
-rm ../%{name}-%{vprog}-jumbo-fix-enh-patch-%{vjumbo}.txt
-
-# Interim jumbo patch update
-%patch -P 1 -p1
-
-# Clean up code
-%patch -P 2 -p1
-
-# Add FLmask feature (rebased patch; original version won't apply after jumbo patch)
-%patch -P 3 -p1
-
-# replace CLK_TCK with sysconf(_SC_CLK_TCK)
-%patch -P 4 -p1
-
-# libpng 1.5 compatibility
-%patch -P 5 -p0
-
-# NAME_MAX buffer overflow fix
-%patch -P 6 -p1
-
-# cut/paste fix for 24bit+ images
-%patch -P 7 -p1
-
-# fix build with -Werror=format-security
-%patch -P 8
-
-# fix crash when viewing PNGs with iTXt/utf8 comments
-%patch -P 9 -p1
-
-# fix crash due to off-by-one smoothing bug
-%patch -P 10 -p1
-
-# Hopefully fix rfbz#3044
-%patch -P 11 -p0
-
-# Fix FTBFS with GCC 10
-%patch -P 12 -p0
-
-# Fix Jasper support to use proper library APIs (patch from Jasper upstream maintainer)
-%patch -P 13 -p0
-
-# Fix some C99-isms introduced in previous patch, breaks build with older compilers
-%patch -P 14 -p2
-
-# Recode docs as UTF-8
-%patch -P 15 -p2
-
-# Honour LDFLAGS if present in the environment
-%patch -P 16 -p2
-
-# Ignore multiple APP1 data structs; libjpeg can't write them
-%patch -P 17 -p2
-
-# Fix segfault seen with some corrupt GIF file
-%patch -P 18 -p2
-
-# Report errors from libjpeg
-%patch -P 19 -p2
-
-# In file selection box, do not move cursor if no filename is there
-# [Novell BZ #506573]
-%patch -P 20 -p2
-
-# In libjpeg the numbers of out_color_components and color_components are
-# different for quantize_colors, i.e. color_components is the colormap
-# (normally 1) [Novell BZ #412491]
-%patch -P 21 -p2
-
-# More thorough version of CLK_TCK patch (patch4)
-# [Novell BZ #237214]
-%patch -P 22 -p2
-
-# Fix compiler options, install directories; enable JPEG 2000 support
-%patch -P 0 -p1
+%setup -q -n xv-%{version}
# Include permission to distribute
install -m 0644 -p %{SOURCE2} .
-# Reorganize docs
-#
-# Note: Man pages for p?m file formats would conflict with netpbm-progs if installed under %%{_mandir}
-mv 00_README README.FLmask
-mv docs/README README.docs
-mkdir docs/{formats,manuals}/
-mv docs/{bmp.doc,epsf.ps,gif*,p[bgp]m.5,xpm.ps} docs/formats/
-mv docs/{xvdocs.{ps,pdf},xvtitle.ps} docs/manuals/
-
-# HTML manual
-mv -f xvman310a docs/manuals/html
-
-# Fix line endings
-for doc in docs/manuals/xv*.ps; do
- sed -e 's/\r$//' ${doc} > ${doc}.unix
- touch -r ${doc} ${doc}.unix
- mv -f ${doc}.unix ${doc}
-done
-
-# Fix directory location of X libs and link with libXt
-sed -i -e 's@-L/usr/X11R6/lib[[:space:]]@-L%{_libdir} -lXt @' Makefile
-
%build
-%{make_build}
+%cmake -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir}
+%cmake_build
%install
-%{make_install}
+%cmake_install
desktop-file-install \
- --dir=%{buildroot}%{_datadir}/applications \
+ --dir %{buildroot}%{_datadir}/applications \
%{SOURCE3}
install -D -p -m 0644 %{SOURCE4} \
- %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-
-# Non-English man pages
-install -D -p -m 0644 fi/man1/xv.1 \
- %{buildroot}%{_mandir}/fi/man1/xv.1
-install -D -p -m 0644 pl/man1/xvpictoppm.1 \
- %{buildroot}%{_mandir}/pl/man1/xvpictoppm.1
-
-# Populate the docs directory
-mkdir -p %{buildroot}%{_docdir}/%{name}-%{vprog}/
-for doc in \
- BUGS \
- CHANGELOG \
- copyright.h \
- CPMASK \
- DISTRIBUTE.txt \
- IDEAS \
- README \
- README.docs \
- README.FLmask \
- README.jumbo \
- README.pcd \
- xv_mgcsfx.sample \
- docs/bigxv.jpg \
- docs/formats/ \
- docs/manuals/
-do
- cp -a ${doc} %{buildroot}%{_docdir}/%{name}-%{vprog}/
-done
+ %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/xv.png
+# Add DISTRIBUTE.txt to the docs directory
+cp -a DISTRIBUTE.txt %{buildroot}%{_docdir}/xv/
%files
-%doc %{_docdir}/%{name}-%{vprog}/BUGS
-%doc %{_docdir}/%{name}-%{vprog}/CHANGELOG
-%doc %{_docdir}/%{name}-%{vprog}/copyright.h
-%doc %{_docdir}/%{name}-%{vprog}/CPMASK
-%doc %{_docdir}/%{name}-%{vprog}/DISTRIBUTE.txt
-%doc %{_docdir}/%{name}-%{vprog}/IDEAS
-%doc %{_docdir}/%{name}-%{vprog}/README
-%doc %{_docdir}/%{name}-%{vprog}/README.FLmask
-%doc %{_docdir}/%{name}-%{vprog}/README.jumbo
-%doc %{_docdir}/%{name}-%{vprog}/README.pcd
-%doc %{_docdir}/%{name}-%{vprog}/xv_mgcsfx.sample
+%doc %{_docdir}/xv/BUGS
+%doc %{_docdir}/xv/CHANGELOG
+%doc %{_docdir}/xv/copyright.h
+%doc %{_docdir}/xv/CPMASK
+%doc %{_docdir}/xv/DISTRIBUTE.txt
+%doc %{_docdir}/xv/IDEAS
+%doc %{_docdir}/xv/README
+%doc %{_docdir}/xv/README.FLmask
+%doc %{_docdir}/xv/README.jumbo
+%doc %{_docdir}/xv/README.pcd
%{_bindir}/bggen
%{_bindir}/vdcomp
%{_bindir}/xcmap
%{_bindir}/xv
%{_bindir}/xvpictoppm
+%config(noreplace) %{_sysconfdir}/xv_mgcsfx
%{_datadir}/applications/xv.desktop
%{_datadir}/icons/hicolor/48x48/apps/xv.png
%{_mandir}/man1/bggen.1*
@@ -302,12 +152,16 @@ done
%lang(pl) %{_mandir}/pl/man1/xvpictoppm.1*
%files doc
-%doc %{_docdir}/%{name}-%{vprog}/README.docs
-%doc %{_docdir}/%{name}-%{vprog}/bigxv.jpg
-%doc %{_docdir}/%{name}-%{vprog}/formats/
-%doc %{_docdir}/%{name}-%{vprog}/manuals/
+%doc %{_docdir}/xv/README.docs
+%doc %{_docdir}/xv/bigxv.jpg
+%doc %{_docdir}/xv/formats/
+%doc %{_docdir}/xv/manuals/
%changelog
+* Thu Jun 8 2023 Paul Howarth <paul(a)city-fan.org> - 4.1.1-1
+- Switch upstream to https://github.com/jasper-software/xv (#6702)
+- Add webp support
+
* Thu Mar 30 2023 Paul Howarth <paul(a)city-fan.org> - 3.10a.jumbopatch.20070520-43
- Avoid deprecated patch syntax
11 months, 2 weeks
[telegram-desktop] Update to 4.8.3.
by Vasiliy Glazov
commit 5ab26a561d57dfb5a4bef0fabe7c82ee3d985e17
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Sat Jun 3 07:41:31 2023 +0300
Update to 4.8.3.
sources | 2 +-
telegram-desktop.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 01687a1..35d0aa8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-4.8.1-full.tar.gz) = 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567
+SHA512 (tdesktop-4.8.3-full.tar.gz) = 11fdd39319d1fdae07094d0ab2cb919355015bee14567d88daf98f9e5332bfee7a938415800397e6f24224e97f6425fe0a1d7549d7de14b63f84ab7cb7741872
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 32e8e50..9453c80 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -5,8 +5,8 @@
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
Name: telegram-desktop
-Version: 4.8.1
-Release: 3%{?dist}
+Version: 4.8.3
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPL-3.0-or-later with OpenSSL exception -- main tarball;
@@ -159,6 +159,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_metainfodir}/*.metainfo.xml
%changelog
+* Sat Jun 03 2023 Vasiliy Glazov <vascom2(a)gmail.com> - 4.8.3-1
+- Update to 4.8.3
+
* Wed May 31 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 4.8.1-3
- Fixed issues with voice and video calls.
11 months, 2 weeks