From 9e6ab1ca5963709c29e39231deb1114d848f2dd7501ff074d4b713fdd514b4d8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 18 Jun 2021 13:29:55 +0000 Subject: [PATCH] Support older products OBS-URL: https://build.opensuse.org/package/show/graphics/xfig?expand=0&rev=76 --- xfig.changes | 6 ++++++ xfig.spec | 19 ++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/xfig.changes b/xfig.changes index bdf82a7..ed2310a 100644 --- a/xfig.changes +++ b/xfig.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 18 13:26:56 UTC 2021 - Dr. Werner Fink + +- Make spec file build with older SLE versions as well to be able + to bundle this with a security update of package transfig + ------------------------------------------------------------------- Thu Apr 1 11:47:00 UTC 2021 - Dr. Werner Fink diff --git a/xfig.spec b/xfig.spec index 8546706..5e8c152 100644 --- a/xfig.spec +++ b/xfig.spec @@ -45,16 +45,24 @@ BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: flex BuildRequires: freetype2-devel -BuildRequires: libXmu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: netpbm BuildRequires: pkgconfig BuildRequires: update-desktop-files +%if 0%{?suse_version} > 1310 BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw3d) BuildRequires: pkgconfig(xaw6) +BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xt) +%else +BuildRequires: xaw3d-devel +BuildRequires: xorg-x11-devel +BuildRequires: xz +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%endif Requires: efont-unicode Requires: ghostscript-fonts-std Requires: ifnteuro @@ -65,10 +73,11 @@ Requires: transfig Requires: xorg-x11-fonts Requires: xorg-x11-fonts-core Provides: xfig.3.2.3d -%if 0%{?suse_version} > 1310 -BuildRequires: libXaw3d-devel -%else -BuildRequires: xaw3d-devel +%if ! %{defined make_build} +%define make_build make %{?_smp_mflags} +%endif +%if ! %{defined make_install} +%define make_install make install DESTDIR=%{?buildroot} INSTALL="install -p" %endif %description