From 255e71ef0c92203d0dc579c493df5c742e49fe30ee5f8ace3513968ef28ce3ae Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 14 Dec 2017 07:44:45 +0000 Subject: [PATCH] Accepting request 556540 from home:dimstar:Factory - 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 --- texlive.changes | 14 ++++++++++++++ texlive.spec | 9 ++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/texlive.changes b/texlive.changes index 3d69a50..94331ad 100644 --- a/texlive.changes +++ b/texlive.changes @@ -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 diff --git a/texlive.spec b/texlive.spec index 1c7605c..f5c9411 100644 --- a/texlive.spec +++ b/texlive.spec @@ -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