From 255e71ef0c92203d0dc579c493df5c742e49fe30ee5f8ace3513968ef28ce3ae Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 14 Dec 2017 07:44:45 +0000 Subject: [PATCH 1/2] 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 From 7b286be809d1d369d210db99411838fc76e3b39e9fe9428d83149c7e9a89c910 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 14 Dec 2017 07:56:01 +0000 Subject: [PATCH 2/2] posttrans as well as Mesa pkgconfig and % expansion OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=265 --- texlive.changes | 7 +++++++ texlive.spec | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/texlive.changes b/texlive.changes index 94331ad..6673866 100644 --- a/texlive.changes +++ b/texlive.changes @@ -12,6 +12,13 @@ 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'. +------------------------------------------------------------------- +Fri Nov 24 12:46:53 UTC 2017 - werner@suse.de + +- Disable by a build conditions using zypper way of posttrans scripts + as we already use %posttrans. Nevertheless correct naming scheme + (boo#1069445) + ------------------------------------------------------------------- Tue Nov 14 16:41:11 UTC 2017 - werner@suse.de diff --git a/texlive.spec b/texlive.spec index f5c9411..f46117c 100644 --- a/texlive.spec +++ b/texlive.spec @@ -31,6 +31,8 @@ %endif %global perl_versnum %(rpm -q --qf '%%{VERSION}' perl | sed 's/\\.//g') +%bcond_with zypper_posttrans + # # LuaJIT -- does not build nor support all architectures # Current status is available at https://github.com/LuaJIT/LuaJIT @@ -3999,9 +4001,10 @@ fi mv -f %{buildroot}%{_bindir}/$mktex %{buildroot}%{_libexecdir}/mktex/ ln -sf %{_libexecdir}/mktex/public %{buildroot}%{_bindir}/$mktex done - +%if %{with zypper_posttrans} ln -sf %{_texmfdistdir}/texconfig/zypper.py \ %{buildroot}/var/adm/update-scripts/%{name}-%{version}-%{release}-zypper +%endif pushd ${prefix}/lib/pkgconfig/ for pc in kpathsea ptexenc texlua52 texluajit synctex @@ -4080,7 +4083,9 @@ rm -f /var/run/texlive/run-update #%config(noreplace) %verify(not md5 size mtime) %{_texmfconfdir}/web2c/texmfcnf.lua #%verify(link) %{_texmfmaindir}/web2c/texmfcnf.lua %{_mandir}/man8/public.* +%if %{with zypper_posttrans} %verify(link) /var/adm/update-scripts/%{name}-%{version}-%{release}-zypper +%endif %files a2ping-bin %defattr(-,root,root,755)