[telegram-desktop/f28: 5/5] Merge branch 'master' into f28
by Vitaly Zaitsev
commit f76730751bb369bced3815ea0671e45eda509296
Merge: 8e58622 a8d5647
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Sep 28 17:33:10 2018 +0200
Merge branch 'master' into f28
.gitignore | 4 ++
sources | 2 +-
telegram-desktop-api-tokens.patch | 4 +-
telegram-desktop-build-fixes.patch | 126 ++++++++++++++++++++++++++++------
telegram-desktop-fix-regression.patch | 26 -------
telegram-desktop-system-fonts.patch | 4 +-
telegram-desktop.spec | 32 ++++++---
7 files changed, 137 insertions(+), 61 deletions(-)
---
6 years, 1 month
[telegram-desktop/f28: 4/5] Updated to 1.4.0.
by Vitaly Zaitsev
commit a8d56472e8c8bbf0c4255e8501cdb718bd277236
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Sep 28 17:31:50 2018 +0200
Updated to 1.4.0.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-api-tokens.patch | 2 +-
telegram-desktop-build-fixes.patch | 8 ++++----
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop.spec | 5 ++++-
6 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06e02d8..18d74b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@
/tdesktop-1.3.15.tar.gz
/tdesktop-1.3.16.tar.gz
/tdesktop-1.3.17.tar.gz
+/tdesktop-1.4.0.tar.gz
diff --git a/sources b/sources
index 95d7837..4c5e3f8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
b92e75c44c9d4c9fd96b1d19eb3a666d crl-4291015.tar.gz
-dcf5fe34938a8a734e38548da8a7d1db tdesktop-1.3.17.tar.gz
+65e0e847dfa8ab876a9fa4a75ccb608a tdesktop-1.4.0.tar.gz
diff --git a/telegram-desktop-api-tokens.patch b/telegram-desktop-api-tokens.patch
index 7f6a877..a895e14 100644
--- a/telegram-desktop-api-tokens.patch
+++ b/telegram-desktop-api-tokens.patch
@@ -1,4 +1,4 @@
-From f9f6831f8c40b4e3426820ac8b23b27494fd9f84 Mon Sep 17 00:00:00 2001
+From 58bbe51190fdef71b769fa8e4155d62926f5a96a Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon, 9 Apr 2018 16:57:13 +0200
Subject: [PATCH 2/3] Changed default Telegram Desktop's test API keys to
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 0aa48a8..2f0fbda 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From e8a15085a2b49acb2b12dec6603134317c652702 Mon Sep 17 00:00:00 2001
+From 237d60b7f9814c04a4b278618278388d55c8f560 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.
@@ -799,10 +799,10 @@ index 80259c687..1e1b14748 100644
],
}]
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index 208d5092e..090fb85db 100644
+index f02296c8a..67457a64b 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -749,7 +749,7 @@
+@@ -747,7 +747,7 @@
<(src_loc)/messenger.h
<(src_loc)/observer_peer.cpp
<(src_loc)/observer_peer.h
@@ -811,7 +811,7 @@ index 208d5092e..090fb85db 100644
<(src_loc)/settings.cpp
<(src_loc)/settings.h
<(src_loc)/shortcuts.cpp
-@@ -758,13 +758,6 @@
+@@ -756,13 +756,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index c16b7ce..1deeb62 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 100fbd3222bcd4040f59439dbd4cf1c2ca598dfa Mon Sep 17 00:00:00 2001
+From e3c1c2ad2713e174039832f0798f7029e286f62f 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 3/3] Backported and rebased patch from Debian maintainer
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index bbe9620..57b264f 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -10,7 +10,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.3.17
+Version: 1.4.0
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -143,6 +143,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Fri Sep 28 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.4.0-1
+- Updated to 1.4.0.
+
* Wed Sep 26 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.17-1
- Updated to 1.3.17 (alpha).
6 years, 1 month
[telegram-desktop/f28] (5 commits) ...Merge branch 'master' into f28
by Vitaly Zaitsev
Summary of changes:
7e047ab... Updated to 1.3.15 (alpha). (*)
1489112... Updated to 1.3.16 (alpha). (*)
d46eeb8... Updated to 1.3.17 (alpha). (*)
a8d5647... Updated to 1.4.0.
f767307... Merge branch 'master' into f28
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[kodi] Update to 18.0 beta 2
by Michael Cronenworth
commit cb3926bf18c475bfd08f9d47b3be610ff17299a1
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Fri Sep 28 08:59:46 2018 -0500
Update to 18.0 beta 2
.gitignore | 2 +-
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 17 +++++++++++++++--
sources | 2 +-
4 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dde6826..aca26cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/kodi-18.0b1v2-patched.tar.xz
/kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
/kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz
+/kodi-18.0b2-patched.tar.xz
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 3fd4a9a..09e093f 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=18
-MINORVERSION=0b1v2
+MINORVERSION=0b2
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Leia
diff --git a/kodi.spec b/kodi.spec
index 58acb76..dcb6b84 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE b1v2
+%global PRERELEASE b2
#global DIRVERSION %{version}
#global GITCOMMIT Gotham_r2-ge988513
# use the line below for pre-releases
@@ -30,7 +30,7 @@
Name: kodi
Version: 18.0
-Release: 0.8.b1%{?dist}
+Release: 0.9.b2%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -194,6 +194,7 @@ BuildRequires: pixman-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: python2-devel
BuildRequires: python2-pillow
+BuildRequires: /usr/bin/pathfix.py
BuildRequires: rapidjson-devel
BuildRequires: sqlite-devel
BuildRequires: swig
@@ -334,6 +335,15 @@ This package contains the Kodi binary for X11 servers.
%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p1 -b.versioning
%patch2 -p1 -b.assert
+# Fix up Python shebangs
+pathfix.py -pni "%{__python2} %{py2_shbang_opts}" \
+ tools/EventClients/lib/python/zeroconf.py \
+ tools/EventClients/Clients/PS3BDRemote/ps3_remote.py \
+ tools/EventClients/lib/python/ps3/sixaxis.py \
+ tools/EventClients/lib/python/ps3/sixpair.py \
+ tools/EventClients/lib/python/ps3/sixwatch.py \
+ tools/EventClients/Clients/KodiSend/kodi-send.py \
+ tools/EventClients/lib/python/xbmcclient.py
%build
@@ -471,6 +481,9 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/
%changelog
+* Thu Sep 27 2018 Michael Cronenworth <mike(a)cchtml.com> - 18.0-0.9.b2
+- Kodi 18.0 beta 2
+
* Fri Aug 31 2018 Michael Cronenworth <mike(a)cchtml.com> - 18.0-0.8.b1
- Fix Requires and versioning in new split packages
diff --git a/sources b/sources
index 8075ee6..4769bcb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-1708584c564024241b32ff67bd566966 kodi-18.0b1v2-patched.tar.xz
+a1893cc1488d2c81bcba8d5fad0e2384 kodi-18.0b2-patched.tar.xz
2aec5f8c790449126118abc6bb3cb5cd kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
f3244e7b002d37f91cc6a77461c4f619 kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz
6 years, 1 month
[nvidia-xconfig] Remove Group tag
by Leigh Scott
commit 8bb16311ba06f1abbb05db95264183c512ba7b9f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 28 11:10:17 2018 +0100
Remove Group tag
nvidia-xconfig.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/nvidia-xconfig.spec b/nvidia-xconfig.spec
index c6b7e58..5a12b01 100644
--- a/nvidia-xconfig.spec
+++ b/nvidia-xconfig.spec
@@ -3,7 +3,6 @@ Version: 410.57
Release: 1%{?dist}
Summary: NVIDIA X configuration file editor
-Group: Applications/System
License: GPLv2+
URL: https://download.nvidia.com/XFree86/nvidia-xconfig
Source0: %{url}/nvidia-xconfig-%{version}.tar.bz2
6 years, 1 month
[nvidia-settings] Remove Group tag
by Leigh Scott
commit 2252acf17ba8d9375b400da6e49a0bfef76bf26d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 28 11:09:25 2018 +0100
Remove Group tag
nvidia-settings.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index f2e2b05..3683002 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -4,7 +4,6 @@ Version: 410.57
Release: 2%{?dist}
Summary: Configure the NVIDIA graphics driver
-Group: Applications/System
License: GPLv2+
URL: https://download.nvidia.com/XFree86/nvidia-settings/
Source0: %{url}/nvidia-settings-%{version}.tar.bz2
6 years, 1 month
[nvidia-kmod] Remove Group tag
by Leigh Scott
commit 79c788faaa4c076a076358ede9af69d40e4bf79f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 28 11:08:28 2018 +0100
Remove Group tag
nvidia-kmod.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 3c169b9..71ee586 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -12,7 +12,6 @@ Version: 410.57
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
-Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
6 years, 1 month
[qt5-qtwebengine-freeworld] revert use of %%make_build macro
by Rex Dieter
commit c1aa64ab449e83f1ce0eed0ba8ba5117a0032d35
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Thu Sep 27 23:11:34 2018 -0500
revert use of %%make_build macro
qt5-qtwebengine-freeworld.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 4132c62..c3ea5d3 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -396,7 +396,7 @@ export NINJA_PATH=%{__ninja}
%{qmake_qt5} CONFIG+="%{debug_config}" \
QMAKE_EXTRA_ARGS+="-system-webengine-icu %{?system_ffmpeg_flag} -proprietary-codecs" .
-%make_build || make -j2 -O
+make %{?_smp_mflags}
%install
# install the libraries to a special directory to avoid conflict with official
@@ -425,6 +425,7 @@ echo "%{_libdir}/%{name}" \
* Thu Sep 27 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.11.2-1
- 5.11.2
- exclude %%arm from bootstrap again
+- revert use of %%make_build, it buffers too much output
* Mon Sep 24 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.11.1-3
- use bundled minizip on f30+ (rhbz#1632196)
6 years, 1 month
