From c6b51daab073d10b9858717386c95a72135c14508275c304c8fc7d34daccfe86 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Tue, 27 Feb 2018 13:26:07 +0000 Subject: [PATCH] Accepting request 580361 from home:badshah400:branches:server:messaging - Use -a instead of -b to \%setup to fix buing on openSUSE >= 1500; this behaviour changed with rpm 4.14. - Add BuildRequires: python2-base as python2 executable is needed for gyp scripts. It was being automatically pulled in for Factory, but not for Leap:15.0. OBS-URL: https://build.opensuse.org/request/show/580361 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=34 --- telegram-desktop.changes | 9 +++++++++ telegram-desktop.spec | 8 +++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/telegram-desktop.changes b/telegram-desktop.changes index 4095e1d..d92fbfd 100644 --- a/telegram-desktop.changes +++ b/telegram-desktop.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Feb 26 22:17:19 UTC 2018 - badshah400@gmail.com + +- Use -a instead of -b to \%setup to fix buing on openSUSE >= + 1500; this behaviour changed with rpm 4.14. +- Add BuildRequires: python2-base as python2 executable is needed + for gyp scripts. It was being automatically pulled in for + Factory, but not for Leap:15.0. + ------------------------------------------------------------------- Fri Jan 12 12:33:13 UTC 2018 - badshah400@gmail.com diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 089376b..dc504c0 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -55,6 +55,8 @@ BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: gcc-c++ >= 7 BuildRequires: python3 +# python2-base is required for gyp [automatically pulled in for Factory, but added here for Leap:15.0, where it isn't] +BuildRequires: python2-base BuildRequires: libXfixes-devel BuildRequires: libexpat-devel BuildRequires: libjpeg-devel @@ -159,9 +161,9 @@ patch -p1 < tdesktop.patch cp %{_sourcedir}/patch.py . && python3 ./patch.py cp %{_sourcedir}/catch.hpp ./Telegram/SourceFiles/ -%setup -q -T -c -n breakpad -b 1 -%setup -q -T -c -n breakpad-lss -b 2 -%setup -q -T -c -n gyp -b 3 +%setup -q -T -c -n breakpad -a 1 +%setup -q -T -c -n breakpad-lss -a 2 +%setup -q -T -c -n gyp -a 3 %if 0%{?suse_version} > 1320 pushd %{_builddir}/breakpad/src