[telegram-desktop/f28: 2/2] Merge branch 'master' into f28
by Vitaly Zaitsev
commit 4c197e2b9944fe706ec97b4cfb128dd52cbb197f
Merge: c52cfe6 8087177
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Oct 13 18:18:05 2018 +0500
Merge branch 'master' into f28
.gitignore | 1 +
sources | 2 +-
telegram-desktop-api-tokens.patch | 4 +--
telegram-desktop-build-fixes.patch | 4 +--
telegram-desktop-logout-crash-fix.patch | 46 ---------------------------------
telegram-desktop-system-fonts.patch | 4 +--
telegram-desktop.spec | 9 ++++---
7 files changed, 13 insertions(+), 57 deletions(-)
---
6 years, 1 month
[telegram-desktop/f28: 1/2] Updated to version 1.4.3.
by Vitaly Zaitsev
commit 80871778b9781e9034a81ca30d88212d5b5e255b
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Oct 13 15:17:49 2018 +0200
Updated to version 1.4.3.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-api-tokens.patch | 4 +--
telegram-desktop-build-fixes.patch | 4 +--
telegram-desktop-logout-crash-fix.patch | 46 ---------------------------------
telegram-desktop-system-fonts.patch | 4 +--
telegram-desktop.spec | 9 ++++---
7 files changed, 13 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a390fd..d951233 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@
/tdesktop-1.3.17.tar.gz
/tdesktop-1.4.0.tar.gz
/tdesktop-1.4.2.tar.gz
+/tdesktop-1.4.3.tar.gz
diff --git a/sources b/sources
index 2996455..f7dfac7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
b92e75c44c9d4c9fd96b1d19eb3a666d crl-4291015.tar.gz
-d9f6fbbbffc27b18922ff67a21fa82a0 tdesktop-1.4.2.tar.gz
+8786fea9f58542aa76ed898879fa0631 tdesktop-1.4.3.tar.gz
diff --git a/telegram-desktop-api-tokens.patch b/telegram-desktop-api-tokens.patch
index 92b0f9e..d62d848 100644
--- a/telegram-desktop-api-tokens.patch
+++ b/telegram-desktop-api-tokens.patch
@@ -1,4 +1,4 @@
-From 73ea570088802ae28b3a7ac2f950f3dd965c61af Mon Sep 17 00:00:00 2001
+From 0e54a8970ec3aaf9411be0948f7aed9df72cd25a 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
@@ -25,5 +25,5 @@ index 863d0280e..255afd80c 100644
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
--
-2.17.1
+2.17.2
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 4366277..d1f1e0e 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From b081fb92d0fa68c99f03bfb2d814082bd41523d7 Mon Sep 17 00:00:00 2001
+From 2da9a65c2f0d10a1c30134c48a9894270bb83f13 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.
@@ -856,5 +856,5 @@ index 0a8069512..550b9f785 100644
StartupWMClass=TelegramDesktop
Type=Application
--
-2.17.1
+2.17.2
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index d0700dd..ea5f7e4 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From bee797f8a0c8e1517a44b004e9438a921cb7e6e5 Mon Sep 17 00:00:00 2001
+From b9deb89449e8f1523bd5d94d3f9daeaccae1881a 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
@@ -42,5 +42,5 @@ index 71f318229..8912791a3 100644
#ifdef Q_OS_WIN
// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
--
-2.17.1
+2.17.2
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 31e1fc7..e568fea 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -10,8 +10,8 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.4.2
-Release: 2%{?dist}
+Version: 1.4.3
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
@@ -30,8 +30,6 @@ Patch0: %{name}-build-fixes.patch
Patch1: %{name}-api-tokens.patch
Patch2: %{name}-system-fonts.patch
-Patch100: %{name}-logout-crash-fix.patch
-
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
Recommends: libappindicator-gtk3%{?_isa}
Requires: qt5-qtimageformats%{?_isa}
@@ -145,6 +143,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Sat Oct 13 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.4.3-1
+- Updated to 1.4.3.
+
* Wed Oct 10 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.4.2-2
- Backported patch with crash fix on logout.
6 years, 1 month
[mpv/f28] Update to 0.29.1
by Leigh Scott
Summary of changes:
591ae0e... Update to 0.29.1 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[mpv/f29] Update to 0.29.1
by Leigh Scott
Summary of changes:
591ae0e... Update to 0.29.1 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[mpv] Update to 0.29.1
by Leigh Scott
commit 591ae0ece48838a583633d4068848da743971879
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Oct 13 08:54:42 2018 +0100
Update to 0.29.1
mpv.spec | 27 ++++++++++++++-------------
sources | 2 +-
2 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index a81bfd9..29cd5c6 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,6 +1,6 @@
Name: mpv
-Version: 0.29.0
-Release: 3%{?dist}
+Version: 0.29.1
+Release: 1%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+ and LGPLv2+
URL: http://%{name}.io/
@@ -82,8 +82,6 @@ output methods are supported.
%package libs
Summary: Dynamic library for Mpv frontends
-Provides: libmpv = %{version}-%{release}
-Obsoletes: libmpv < %{version}-%{release}
%description libs
This package contains the dynamic library libmpv, which provides access to Mpv.
@@ -91,8 +89,6 @@ This package contains the dynamic library libmpv, which provides access to Mpv.
%package libs-devel
Summary: Development package for libmpv
Requires: mpv-libs%{?_isa} = %{version}-%{release}
-Provides: libmpv-devel = %{version}-%{release}
-Obsoletes: libmpv-devel < %{version}-%{release}
%description libs-devel
Libmpv development header files and libraries.
@@ -102,8 +98,8 @@ Libmpv development header files and libraries.
%build
-CFLAGS="${RPM_OPT_FLAGS}" \
-LDFLAGS="${RPM_LD_FLAGS}" \
+CFLAGS="%{optflags}" \
+LDFLAGS="%{?__global_ldflags}" \
waf configure \
--prefix=%{_prefix} \
--bindir=%{_bindir} \
@@ -129,17 +125,17 @@ waf -v build %{?_smp_mflags}
waf install --destdir=%{buildroot}
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}/%{name}
+install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}/%{name}/
%files
-%docdir %{_docdir}/%{name}
-%{_docdir}/%{name}
+%docdir %{_docdir}/%{name}/
+%{_docdir}/%{name}/
%license LICENSE.GPL LICENSE.LGPL Copyright
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}*.*
%{_mandir}/man1/%{name}.*
-%dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/
%config(noreplace) %{_sysconfdir}/%{name}/encoding-profiles.conf
%files libs
@@ -147,11 +143,16 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
%{_libdir}/libmpv.so.*
%files libs-devel
-%{_includedir}/%{name}
+%{_includedir}/%{name}/
%{_libdir}/libmpv.so
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Sat Oct 13 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.29.1-1
+- Update to 0.29.1
+- Drop old Obsoletes and Provides
+- Use modern marcos
+
* Tue Oct 02 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.29.0-3
- Add BuildRequires: libshaderc-devel
diff --git a/sources b/sources
index 5c479af..d52d6c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a4844da6f3683e27a99db7703721a64 mpv-0.29.0.tar.gz
+2cd070c6aed980786177b7cb5b73664b mpv-0.29.1.tar.gz
6 years, 1 month
[vdr-xineliboutput] Update to 2.1.0-9.20181005gitb298178 Add BR gcc-c++
by Martin Gansser
commit 638363edcaa4b9ab7f2935c485d84bf0187905c9
Author: Martin Gansser <mgansser(a)online.de>
Date: Fri Oct 12 19:53:45 2018 +0200
Update to 2.1.0-9.20181005gitb298178
Add BR gcc-c++
vdr-xineliboutput.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/vdr-xineliboutput.spec b/vdr-xineliboutput.spec
index a56d391..147e320 100644
--- a/vdr-xineliboutput.spec
+++ b/vdr-xineliboutput.spec
@@ -25,6 +25,7 @@ Source0: %{name}-%{version}-%{gitrev}.tar.gz
Source1: %{name}.conf
Source2: allowed_hosts.conf
+BuildRequires: gcc-c++
BuildRequires: gettext
BuildRequires: vdr-devel >= %{vdrver}
BuildRequires: libextractor-devel >= 0.5.22
@@ -148,6 +149,7 @@ find %{buildroot}%{xineplugindir} -name '*.so' -exec chmod +x '{}' ';'
%changelog
* Fri Oct 12 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 2.1.0-9.20181005gitb298178
- Update to 2.1.0-9.20181005gitb298178
+- Add BR gcc-c++
* Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.1.0-8.20180701git97b7e78
- Rebuilt for Fedora 29 Mass Rebuild binutils issue
6 years, 1 month