From d1f2603a8bd2738c03b418db326bb83700b017d8bf0a4d8e3b5f8477c3294058 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 15 Mar 2018 07:49:08 +0000 Subject: [PATCH] Integrate SR#587057 into Meta and TeXLive OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=278 --- texlive.changes | 5 +++++ texlive.spec | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/texlive.changes b/texlive.changes index 2f71357..27ac3ef 100644 --- a/texlive.changes +++ b/texlive.changes @@ -3,6 +3,11 @@ Thu Mar 15 07:29:33 UTC 2018 - werner@suse.de - Add missing dependencies for perl-biber (boo#1084900) +------------------------------------------------------------------- +Wed Mar 14 18:57:04 UTC 2018 - crrodriguez@opensuse.org + +- Remove xorg-x11-devel and Mesa-devel from buildrequires. + ------------------------------------------------------------------- Tue Feb 6 15:14:53 UTC 2018 - meissner@suse.com diff --git a/texlive.spec b/texlive.spec index 3c40a56..1f8c1eb 100644 --- a/texlive.spec +++ b/texlive.spec @@ -134,9 +134,6 @@ BuildRequires: %{name}-filesystem BuildRequires: ghostscript-devel BuildRequires: ghostscript-library BuildRequires: glibc-devel -%if 0%{suse_version} > 1220 -BuildRequires: glu-devel -%endif BuildRequires: graphite2-devel BuildRequires: gsl-devel BuildRequires: harfbuzz-devel @@ -144,12 +141,6 @@ BuildRequires: jpeg BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libopenssl-devel -%if 0%{suse_version} > 1220 -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(osmesa) -%else -BuildRequires: Mesa-devel -%endif BuildRequires: libpaper-devel BuildRequires: libpng-devel BuildRequires: libpoppler-devel @@ -164,14 +155,21 @@ BuildRequires: pango-tools BuildRequires: potrace-devel BuildRequires: pwdutils BuildRequires: readline-devel +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glu) BuildConflicts: texinfo BuildRequires: unzip BuildRequires: xaw3d-devel -BuildRequires: xorg-x11-devel BuildRequires: xz BuildRequires: zip BuildRequires: zlib-devel BuildRequires: zziplib-devel +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(xt) %if %{with buildbiber} BuildRequires: perl-base >= 5.24.1 BuildRequires: perl(autovivification)