[telegram-desktop/f28: 2/2] Merge branch 'master' into f28
by Vitaly Zaitsev
commit caa28c0670e86e51e645800b8adc90dd79913c8f
Merge: 1b715e3 6d5ce37
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Mar 26 11:49:03 2019 +0100
Merge branch 'master' into f28
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 2 +-
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 2 +-
telegram-desktop.spec | 5 ++++-
6 files changed, 9 insertions(+), 5 deletions(-)
---
5 years, 1 month
[telegram-desktop/f28: 1/2] Updated to version 1.6.3.
by Vitaly Zaitsev
commit 6d5ce37d15388f3277ee11379a4fc1c6735dfd79
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Mar 26 11:48:47 2019 +0100
Updated to version 1.6.3.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 2 +-
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 2 +-
telegram-desktop.spec | 5 ++++-
6 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c95034..202cb72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,4 @@
/tdesktop-1.6.0.tar.gz
/tdesktop-1.6.1.tar.gz
/tdesktop-1.6.2.tar.gz
+/tdesktop-1.6.3.tar.gz
diff --git a/sources b/sources
index 674df1d..6b06781 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ae7f024486ddce3b598477bf40a86c79 crl-84072fb.tar.gz
-07dfc750edd0431cb9f0dacf444338a3 tdesktop-1.6.2.tar.gz
+a16cce2ab039dc6d7d8d725619dfc9de tdesktop-1.6.3.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 901851d..bf2bdfc 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 2cee07d451f2d51f9af8977d25dfda869668f6b8 Mon Sep 17 00:00:00 2001
+From ab210358b0e28c03df08b7d29f00c69282278696 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 1/3] Fixed build under Fedora using rpmbuild and mock.
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 7756346..8be3d77 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 626d85b8c2177eea0a2a36252f631a7c28aad8a3 Mon Sep 17 00:00:00 2001
+From b2984ea52bebf7465dc0eabdd7127f628c8181c0 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 2/3] Backported and rebased patch from Debian maintainer
diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch
index 3c4b73b..79a66ac 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From ea45ebc48e5d72640ad253ce28910ccf78586ce1 Mon Sep 17 00:00:00 2001
+From 03b2140744dbb1603bf87b712370d43097b8748c Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed, 17 Oct 2018 17:57:59 +0200
Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29.
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 5e11c08..6d49edc 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -15,7 +15,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.6.2
+Version: 1.6.3
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -167,6 +167,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Tue Mar 26 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.6.3-1
+- Updated to 1.6.3.
+
* Sun Mar 24 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.6.2-1
- Updated to 1.6.2.
5 years, 1 month
[xpra-codecs-freeworld] Release to 2.5.0
by Antonio
commit 91844b3217b17201aec8f99780c1b9bf113c3538
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Tue Mar 26 09:16:53 2019 +0100
Release to 2.5.0
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 14 +++++++++-----
3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f1e5324..563c0fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ xpra-0.16.3.tar.xz
/xpra-2.4.1.tar.xz
/xpra-2.4.2.tar.xz
/xpra-2.4.3.tar.xz
+/xpra-2.5.tar.xz
diff --git a/sources b/sources
index d376e20..498d69b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c35cea9a2e11435ca7708de478cfa541 xpra-2.4.3.tar.xz
+37673c240ddb0610bd85349763db2a46 xpra-2.5.tar.xz
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 9407138..55a7f04 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -11,7 +11,7 @@
# xpra does not correctly work with Python3 yet
# Starting from Fedora 30, Python 2 will be no longer supported
-%if %{?fedora} < 30
+%if %{?fedora} < 29
%global py_prefix 2
%global pythonx_sitearch %python2_sitearch
%else
@@ -35,12 +35,12 @@
%endif
Name: xpra-codecs-freeworld
-Version: 2.4.3
-Release: 4%{?dist}
+Version: 2.5.0
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
URL: http://www.xpra.org/
-Source0: http://xpra.org/src/xpra-%{version}.tar.xz
+Source0: http://xpra.org/src/xpra-2.5.tar.xz
BuildRequires: python%py_prefix-devel
BuildRequires: pygobject%py_prefix-devel
@@ -73,7 +73,7 @@ Provides support for H.264 encoding and swscale support in xpra using
x264 and ffmpeg.
%prep
-%autosetup -n xpra-%{version}
+%autosetup -n xpra-2.5
%build
CFLAGS="%{optflags}" %{_bindir}/python%py_prefix setup.py build --executable="%{_bindir}/python%py_prefix -s" \
@@ -130,6 +130,10 @@ find %{buildroot}%{pythonx_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Wed Mar 20 2019 Antonio Trande <sagitter(a)fedoraproject.org> - 2.5.0-1
+- Release to 2.5.0
+- Switch to Python3 on Fedora 29+
+
* Tue Mar 12 2019 Sérgio Basto <sergio(a)serjux.com> - 2.4.3-4
- Mass rebuild for x264
5 years, 1 month
[obs-studio/el7] (40 commits) ...Added EL7 branch
by Momcilo Medic
Summary of changes:
7320354... Updated to 17.0.2 (*)
68a8ebc... Fix #4436 (*)
662f136... Fix #4436 (*)
2eed5d3... Updated to 18.0.0 (*)
5803290... remove obs patch from gitignore and readd it properly (*)
d8a27f1... Updated to 18.0.1 (*)
e39e698... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
ad43af2... Rebuild for ffmpeg update (*)
0ece830... Updated to 18.0.2 (*)
88ca181... Rebuild for ffmpeg update (*)
60b7e32... Updated to 19.0.2 (*)
a598336... Updated to 19.0.3 (*)
5ade2d4... Updated to 20.0.0 (*)
f8034c4... Updated to 20.0.1 (*)
50971b0... Updated to 20.1.3 (*)
26c04b2... Mass rebuild for x264 and x265 (*)
360ee92... Rebuilt for ffmpeg-3.5 git (*)
6b9ca3f... Updated to 21.0.2 (*)
0d9eaa6... Fix scriptlets (*)
e9e8c09... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*)
16fffea... - Rebuilt for new ffmpeg snapshot (*)
e65c5d7... Update to 21.0.3 Add BR faac-devel Add BR python3-devel Add (*)
3d2e94f... Update to 21.0.3 Add BR python3-devel Add bytecompile with (*)
25cc932... Update to 21.1.0 (*)
e70776a... Update to 21.1.1 (*)
4caa2b0... Update to 21.1.2 (*)
dcf9aeb... Rebuilt for Python 3.7 (*)
a9c7c8c... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*)
c28f584... Updated to 22.0.1 (*)
c1934f4... Updated to 22.0.1 (*)
f257704... Updated to 22.0.3 (*)
8b7a4b8... Mass rebuild for x264 and/or x265 (*)
92c4b90... Fixed new dependencies and enabled scripting (*)
d5f19e8... Updated to 23.0.0 (*)
e883faa... fix pkgconfig dir and build warning (*)
1056c8e... fix (*)
53cd003... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*)
a80e6a0... Updated to 23.0.2 (*)
6375030... Mass rebuild for x264 (*)
2c91c24... Added EL7 branch (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 1 month
[qt5-qtwebengine-freeworld] revert use system libxml2/libxslt
by Rex Dieter
commit 9cc96be8d5acf2f6e6681c03ebce1e19f5f604b9
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Mar 25 15:31:52 2019 -0500
revert use system libxml2/libxslt
qt5-qtwebengine-freeworld.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 246691e..cbaa6c2 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -161,7 +161,8 @@ BuildRequires: pkgconfig(libpci)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(lcms2)
-BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0)
+## https://bugreports.qt.io/browse/QTBUG-59094
+#BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0)
BuildRequires: perl-interpreter
BuildRequires: python2-devel
%if 0%{?use_system_libvpx}
@@ -409,7 +410,6 @@ echo "%{_libdir}/%{name}" \
%changelog
* Mon Mar 25 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 5.12.2-1
- 5.12.2
-- use system libxml2/libxslt
* Tue Mar 12 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 5.12.1-1
- 5.12.1, sync changes from fedora packaging (deps, patches, etc...)
5 years, 1 month
[obs-studio] Added EL7 branch
by Momcilo Medic
commit 2c91c24a0f141d3e515794e33bfb87a69ab0791b
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Mon Mar 25 21:09:06 2019 +0100
Added EL7 branch
obs-studio.spec | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 8d78281..0e3faa3 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,9 +1,13 @@
+%if 0%{?fedora} || 0%{?rhel} > 7
# bytecompile with Python 3
%global __python %{__python3}
+%else
+%global __python %{__python2}
+%endif
Name: obs-studio
Version: 23.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
@@ -37,8 +41,16 @@ BuildRequires: vlc-devel
BuildRequires: alsa-lib-devel
BuildRequires: systemd-devel
BuildRequires: doxygen
+%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: speexdsp-devel
+%else
+BuildRequires: speex-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: python3-devel
+%else
+BuildRequires: python2-devel
+%endif
BuildRequires: luajit-devel
BuildRequires: swig
BuildRequires: libxcb-devel
@@ -136,6 +148,10 @@ mv -f %{buildroot}/%{_prefix}/lib/pkgconfig/ %{buildroot}/%{_libdir}/
%doc docs/html
%changelog
+* Mon Mar 18 2019 Xavier Bachelot <xavier(a)bachelot.org> - 23.0.2-3
+- Fix BR: on speex/speexdsp for EL7.
+- Fix BR: on python for EL7.
+
* Tue Mar 12 2019 Sérgio Basto <sergio(a)serjux.com> - 23.0.2-2
- Mass rebuild for x264
5 years, 1 month
[qt5-qtwebengine-freeworld] 5.12.2 use system libxml2/libxslt
by Rex Dieter
commit 20e5a503ae1e6fd60971b3cf37326abc00fa1839
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Mar 25 13:28:28 2019 -0500
5.12.2
use system libxml2/libxslt
.gitignore | 1 +
qt5-qtwebengine-freeworld.spec | 7 ++++++-
sources | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index f1ce5ca..90fbd9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/qtwebengine-everywhere-src-5.11.1.tar.xz
/qtwebengine-everywhere-src-5.11.2.tar.xz
/qtwebengine-everywhere-src-5.11.3.tar.xz
+/qtwebengine-everywhere-src-5.12.2.tar.xz
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 7074a5b..246691e 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -43,7 +43,7 @@
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
-Version: 5.12.1
+Version: 5.12.2
Release: 1%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
@@ -161,6 +161,7 @@ BuildRequires: pkgconfig(libpci)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(lcms2)
+BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0)
BuildRequires: perl-interpreter
BuildRequires: python2-devel
%if 0%{?use_system_libvpx}
@@ -406,6 +407,10 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Mon Mar 25 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 5.12.2-1
+- 5.12.2
+- use system libxml2/libxslt
+
* Tue Mar 12 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 5.12.1-1
- 5.12.1, sync changes from fedora packaging (deps, patches, etc...)
diff --git a/sources b/sources
index e69de29..98449ca 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a5182f10645103b54a35f8611fd13506 qtwebengine-everywhere-src-5.12.2.tar.xz
5 years, 1 month