pool/texlive
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 557088 from Publishing:TeXLive

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.

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

- Disable by a build conditions using zypper way of posttrans scripts
  as we already use %posttrans. Nevertheless correct naming scheme
  (boo#1069445)

OBS-URL: https://build.opensuse.org/request/show/557088
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texlive?expand=0&rev=42
This commit is contained in:
Dominique Leuenberger 2017-12-16 19:47:57 +00:00 committed by Git OBS Bridge
commit b2e4397b8b
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
texlive.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
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'.
-------------------------------------------------------------------
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

16
texlive.spec
View File

@ -27,9 +27,11 @@
%(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')
%bcond_with zypper_posttrans
#
# LuaJIT -- does not build nor support all architectures
@ -146,9 +148,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
@ -4000,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
@ -4081,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)