rpm/texlive
SHA256
1
0
Fork 0
forked from pool/texlive
Code Pull Requests Activity

Accepting request 556540 from home:dimstar:Factory

Browse Source 
- Replace Mesa-libGL-devel and libOSMesa-devel BuildRequires with
  pkgconfig(gl) and pkgconfig(osmesa).
- Drop Mesa-libglapi-devel Buildequires: not needed by texlive for
  a while already.

=> this change helps us/OBS to pick 'cheaper' solutions (but of course fully compatible) that ordering textlive behind Mesa/LLVM

- Escape the usage of %{VERSION} when calling out to rpm.
  RPM 4.14 has %{VERSION} defined as 'the main packages version'.

=> Needed to not fail once RPM 4.14 is being merged

OBS-URL: https://build.opensuse.org/request/show/556540
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=264
This commit is contained in:
Dr. Werner Fink 2017-12-14 07:44:45 +00:00 committed by Git OBS Bridge
parent b0ca6bc086
commit 255e71ef0c
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
texlive.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Dec 12 17:36:08 UTC 2017 - dimstar@opensuse.org
- Replace Mesa-libGL-devel and libOSMesa-devel BuildRequires with
pkgconfig(gl) and pkgconfig(osmesa).
- Drop Mesa-libglapi-devel Buildequires: not needed by texlive for
a while already.
-------------------------------------------------------------------
Thu Dec 7 11:20:45 UTC 2017 - dimstar@opensuse.org
- Escape the usage of %{VERSION} when calling out to rpm.
RPM 4.14 has %{VERSION} defined as 'the main packages version'.
-------------------------------------------------------------------
Tue Nov 14 16:41:11 UTC 2017 - werner@suse.de

9
texlive.spec
View File

@ -27,9 +27,9 @@
%(ls /usr/lib/rpm/brp-suse.d/* 2> /dev/null | grep -vE 'symlink|desktop') %{nil}
%if ! %{defined perl_version}
%global perl_version %(rpm -q --qf '%{VERSION}' perl)
%global perl_version %(rpm -q --qf '%%{VERSION}' perl)
%endif
%global perl_versnum %(rpm -q --qf '%{VERSION}' perl | sed 's/\\.//g')
%global perl_versnum %(rpm -q --qf '%%{VERSION}' perl | sed 's/\\.//g')
#
# LuaJIT -- does not build nor support all architectures
@ -146,9 +146,8 @@ BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: libopenssl-devel
%if 0%{suse_version} > 1220
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libglapi-devel
BuildRequires: libOSMesa-devel
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(osmesa)
%else
BuildRequires: Mesa-devel
%endif