forked from pool/telegram-desktop
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
This commit is contained in:
parent
de847ab192
commit
c6b51daab0
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user