[telegram-desktop/el7: 2/2] Use ExclusiveArch.
by Vitaly Zaitsev
commit cea202eb4b2d132c5454ef7770fda49dac59c885
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Apr 15 15:27:50 2017 +0500
Use ExclusiveArch.
fix_build_under_fedora.patch | 72 ++------------------------------------------
telegram-desktop.spec | 2 +-
2 files changed, 3 insertions(+), 71 deletions(-)
---
diff --git a/fix_build_under_fedora.patch b/fix_build_under_fedora.patch
index 527d763..779b731 100644
--- a/fix_build_under_fedora.patch
+++ b/fix_build_under_fedora.patch
@@ -1,10 +1,9 @@
-From 73eb322805ef31e9fbcb00f0f26200ab77766f5c Mon Sep 17 00:00:00 2001
+From 2ba1652200c05c044794509c29512c2c32d7b31f 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] Fixed build under Fedora using rpmbuild and mock.
---
- Telegram/SourceFiles/base/build_config.h | 52 ++++++++++++++++
Telegram/SourceFiles/main.cpp | 7 ++-
Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++++++++
Telegram/SourceFiles/qt_static_plugins.cpp | 8 ---
@@ -22,76 +21,9 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
Telegram/gyp/utils.gyp | 4 +-
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 6 +-
- 18 files changed, 249 insertions(+), 145 deletions(-)
+ 17 files changed, 197 insertions(+), 145 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
-diff --git a/Telegram/SourceFiles/base/build_config.h b/Telegram/SourceFiles/base/build_config.h
-index 1731630..8826feb 100644
---- a/Telegram/SourceFiles/base/build_config.h
-+++ b/Telegram/SourceFiles/base/build_config.h
-@@ -56,10 +56,62 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
- #define ARCH_CPU_X86_FAMILY 1
- #define ARCH_CPU_X86_64 1
- #define ARCH_CPU_64_BITS 1
-+#define ARCH_CPU_LITTLE_ENDIAN 1
- #elif defined(_M_IX86) || defined(__i386__)
- #define ARCH_CPU_X86_FAMILY 1
- #define ARCH_CPU_X86 1
- #define ARCH_CPU_32_BITS 1
-+#define ARCH_CPU_LITTLE_ENDIAN 1
-+#elif defined(__s390x__)
-+#define ARCH_CPU_S390_FAMILY 1
-+#define ARCH_CPU_S390X 1
-+#define ARCH_CPU_64_BITS 1
-+#define ARCH_CPU_BIG_ENDIAN 1
-+#elif defined(__s390__)
-+#define ARCH_CPU_S390_FAMILY 1
-+#define ARCH_CPU_S390 1
-+#define ARCH_CPU_31_BITS 1
-+#define ARCH_CPU_BIG_ENDIAN 1
-+#elif defined(__PPC64__) && defined(__BIG_ENDIAN__)
-+#define ARCH_CPU_PPC64_FAMILY 1
-+#define ARCH_CPU_PPC64 1
-+#define ARCH_CPU_64_BITS 1
-+#define ARCH_CPU_BIG_ENDIAN 1
-+#elif defined(__PPC64__) && defined(__LITTLE_ENDIAN__)
-+#define ARCH_CPU_PPC64_FAMILY 1
-+#define ARCH_CPU_PPC64 1
-+#define ARCH_CPU_64_BITS 1
-+#define ARCH_CPU_LITTLE_ENDIAN 1
-+#elif defined(__PPC__)
-+#define ARCH_CPU_PPC_FAMILY 1
-+#define ARCH_CPU_PPC 1
-+#define ARCH_CPU_32_BITS 1
-+#define ARCH_CPU_BIG_ENDIAN 1
-+#elif defined(__ARMEL__)
-+#define ARCH_CPU_ARM_FAMILY 1
-+#define ARCH_CPU_ARMEL 1
-+#define ARCH_CPU_32_BITS 1
-+#define ARCH_CPU_LITTLE_ENDIAN 1
-+#elif defined(__aarch64__)
-+#define ARCH_CPU_ARM_FAMILY 1
-+#define ARCH_CPU_ARM64 1
-+#define ARCH_CPU_64_BITS 1
-+#define ARCH_CPU_LITTLE_ENDIAN 1
-+#elif defined(__pnacl__)
-+#define ARCH_CPU_32_BITS 1
-+#define ARCH_CPU_LITTLE_ENDIAN 1
-+#elif defined(__MIPSEL__)
-+#if defined(__LP64__)
-+#define ARCH_CPU_MIPS_FAMILY 1
-+#define ARCH_CPU_MIPS64EL 1
-+#define ARCH_CPU_64_BITS 1
-+#define ARCH_CPU_LITTLE_ENDIAN 1
-+#else
-+#define ARCH_CPU_MIPS_FAMILY 1
-+#define ARCH_CPU_MIPSEL 1
-+#define ARCH_CPU_32_BITS 1
-+#define ARCH_CPU_LITTLE_ENDIAN 1
-+#endif
- #else
- #error Please add support for your architecture in base/build_config.h
- #endif
diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
index 6cd942e..0268e39 100644
--- a/Telegram/SourceFiles/main.cpp
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 878dc07..5e0158c 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -40,7 +40,7 @@ Patch1: add_russian_locale.patch
Requires: hicolor-icon-theme
Requires: qt5-qtimageformats%{?_isa}
Recommends: libappindicator-gtk3%{?_isa}
-ExcludeArch: ppc64
+ExclusiveArch: i686 x86_64
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
7 years, 7 months
[lpf-spotify-client] Update to 1.0.53.758
by Sérgio M. Basto
commit fe2dcf01b1a10f04584ee003dc3bae5127921785
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Apr 15 04:33:33 2017 +0100
Update to 1.0.53.758
check_new_version.py | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
lpf-spotify-client.spec | 7 ++++--
spotify-client.spec.in | 11 ++++++----
3 files changed, 70 insertions(+), 6 deletions(-)
---
diff --git a/check_new_version.py b/check_new_version.py
new file mode 100755
index 0000000..34058ad
--- /dev/null
+++ b/check_new_version.py
@@ -0,0 +1,58 @@
+#!/usr/bin/python3
+
+""" Warning not complete """
+
+import requests
+import re
+import os
+import subprocess
+requests.get('http://repository.spotify.com/pool/non-free/s/spotify-client/')
+a = requests.get('http://repository.spotify.com/pool/non-free/s/spotify-client/')
+#print (a.text)
+
+str_mx = re.compile('href="(spotify-client.*?i386.deb)"')
+str_mx2 = re.compile('href="(spotify-client.*?amd64.deb)"')
+res = str_mx.findall(a.text)
+res2 = str_mx2.findall(a.text)
+deb32 = res[-1]
+deb64 = res2[-1]
+print (deb32,deb64)
+res2 = str_mx.findall(a.text)
+
+regexp = re.compile('spotify-client_(\d{1,2}[.]\d{1,2}[.]\d{1,3})([.].*)')
+(version32, minor32) = regexp.findall(deb32)[0]
+(version64, minor64) = regexp.findall(deb64)[0]
+print (version32, minor32, version64, minor64)
+
+spec = open('spotify-client.spec.in').read()
+#print (spec)
+#str_mx3 = re.compile('(Version:\s*) .*')
+#spec2 = re.sub(str_mx3, r'\1 %s' % version64, spec)
+str_mx4 = re.compile('(Source1:.*?)[.].*')
+spec3 = re.sub(str_mx4, r'\1%s' % minor64, spec)
+str_mx5 = re.compile('(Source2:.*?)[.].*')
+spec4 = re.sub(str_mx5, r'\1%s' % minor32, spec3)
+
+open('spotify-client.spec.in', 'w').write(spec4)
+
+def runme(cmd, env, cwd='.'):
+ """Simple function to run a command and return 0 for success, 1 for
+ failure. cmd is a list of the command and arguments, action is a
+ name for the action (for logging), pkg is the name of the package
+ being operated on, env is the environment dict, and cwd is where
+ the script should be executed from."""
+ try:
+ subprocess.check_call(cmd, env=env, cwd=cwd)
+ except subprocess.CalledProcessError as e:
+ sys.stderr.write('%s failed: %s\n' % (cmd, e))
+ return 1
+ return 0
+
+enviro = os.environ
+pkgcmd = ['rpmdev-bumpspec', '-n', version64, '-c', 'Update to %s%s' % (version64, minor64[:4]), 'spotify-client.spec.in']
+if runme(pkgcmd, enviro):
+ print('error running runme')
+pkgcmd = ['rpmdev-bumpspec', '-n', version64, '-c', 'Update to %s%s' % (version64, minor64[:4]), 'lpf-spotify-client.spec']
+if runme(pkgcmd, enviro):
+ print('error running runme')
+
diff --git a/lpf-spotify-client.spec b/lpf-spotify-client.spec
index f254eea..21f43ba 100644
--- a/lpf-spotify-client.spec
+++ b/lpf-spotify-client.spec
@@ -11,8 +11,8 @@
Name: lpf-spotify-client
# Upstream spotify version, verbatim.
-Version: 1.0.49
-Release: 3%{?dist}
+Version: 1.0.53
+Release: 1%{?dist}
Summary: Spotify music player native client package bootstrap
License: MIT
@@ -76,6 +76,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog
+* Sat Apr 15 2017 Sérgio Basto <sergio(a)serjux.com> - 1.0.53-1
+- Update to 1.0.53.758
+
* Sun Mar 26 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.0.49-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/spotify-client.spec.in b/spotify-client.spec.in
index 9320dab..00d3a9e 100644
--- a/spotify-client.spec.in
+++ b/spotify-client.spec.in
@@ -11,8 +11,8 @@
Name: spotify-client
-Version: 1.0.49
-Release: 3%{?dist}
+Version: 1.0.53
+Release: 1%{?dist}
Summary: Spotify music player native client
# board=http://community.spotify.com/t5/Desktop-Linux
@@ -23,8 +23,8 @@ Group: Applications/Multimedia
ExclusiveArch: i386 i686 x86_64
Source0: spotify-make-%{shortcommit}.tar.gz
-Source1: %{repo}/spotify-client_%{version}.125.g72ee7853-111_amd64.deb
-Source2: %{repo}/spotify-client_%{version}.125.g72ee7853-22_i386.deb
+Source1: %{repo}/spotify-client_%{version}.758.gde3fc4b2-33_amd64.deb
+Source2: %{repo}/spotify-client_%{version}.758.gde3fc4b2-34_i386.deb
%ifarch x86_64
%global spotify_pkg %{SOURCE1}
@@ -116,6 +116,9 @@ fi
%changelog
+* Sat Apr 15 2017 Sérgio Basto <sergio(a)serjux.com> - 1.0.53-1
+- Update to 1.0.53.758
+
* Sun Mar 26 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.0.49-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years, 7 months
[telegram-desktop] Exclude ppc64 as it is not supported by upstream.
by Vitaly Zaitsev
commit 3a7372f84eb360b3fac4cfbdbea7ddfa88bc1bb1
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Apr 14 22:53:46 2017 +0500
Exclude ppc64 as it is not supported by upstream.
telegram-desktop.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 41c8fda..878dc07 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -40,6 +40,7 @@ Patch1: add_russian_locale.patch
Requires: hicolor-icon-theme
Requires: qt5-qtimageformats%{?_isa}
Recommends: libappindicator-gtk3%{?_isa}
+ExcludeArch: ppc64
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
7 years, 7 months