RPM: update build scripts for Opensuse TumbleWeed

pull/3/head
François Andriot 6 years ago
parent fbd894a9bf
commit a84a6c177e

@ -211,7 +211,7 @@ endif
lcms: lcms:
# Build on EL7, OSSTW # Build on EL7, OSSTW
ifeq (,$(filter $(DIST),.el7 osstw)) ifneq (,$(filter $(DIST),.el7 .osstw))
$(call buildpkg,3rdparty/lcms) $(call buildpkg,3rdparty/lcms)
endif endif
@ -280,7 +280,7 @@ endif
recode: recode:
# Build on OpenSUSE >= 15.0 only # Build on OpenSUSE >= 15.0 only
ifneq (,$(filter $(DIST),.oss150)) ifneq (,$(filter $(DIST),.oss150 .osstw))
$(call buildpkg,3rdparty/recode) $(call buildpkg,3rdparty/recode)
endif endif
@ -624,7 +624,7 @@ ksquirrel: tdebase libkipi libksquirrel
kstreamripper: tdebase kstreamripper: tdebase
# Do NOT build on Fedora 27, OpenSUSE >= 15.0 (problem with scons and python3) # Do NOT build on Fedora 27, OpenSUSE >= 15.0 (problem with scons and python3)
ifeq (,$(filter $(DIST),.fc27 .oss150)) ifeq (,$(filter $(DIST),.fc27 .oss150 .osstw))
$(call buildpkg,applications/kstreamripper) $(call buildpkg,applications/kstreamripper)
endif endif
@ -830,7 +830,7 @@ endif
klibido: pan klibido: pan
# Not on RHEL5, nor recent OpenSUSE # Not on RHEL5, nor recent OpenSUSE
ifeq (,$(filter $(DIST),.el5 .oss150)) ifeq (,$(filter $(DIST),.el5 .oss150 .osstw))
$(call buildpkg,extras/klibido) $(call buildpkg,extras/klibido)
endif endif
@ -853,7 +853,7 @@ mathemagics:
$(call buildpkg,extras/mathemagics) $(call buildpkg,extras/mathemagics)
pan: gmime intltool pan: gmime intltool
ifeq (,$(filter $(DIST),.el5 .oss150)) ifeq (,$(filter $(DIST),.el5 .oss150 .osstw)))
$(call buildpkg,3rdparty/pan) $(call buildpkg,3rdparty/pan)
endif endif

@ -191,7 +191,7 @@ BuildRequires: libofa-devel
%if 0%{?mgaversion} && 0%{?mgaversion} <= 2 %if 0%{?mgaversion} && 0%{?mgaversion} <= 2
BuildRequires: libtunepimp-devel BuildRequires: libtunepimp-devel
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} != 1500 %if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} < 1500
BuildRequires: libtunepimp-devel BuildRequires: libtunepimp-devel
%endif %endif
%if 0%{?fedora} && 0%{?fedora} <= 23 %if 0%{?fedora} && 0%{?fedora} <= 23

@ -110,7 +110,7 @@ Requires(postun): coreutils
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1500 %if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500
Requires: wodim Requires: wodim
REquires: genisoimage REquires: genisoimage
%else %else

@ -177,7 +177,7 @@ BuildRequires: libutempter-devel
# POPPLER support # POPPLER support
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
%if 0%{?suse_version} == 1500 %if 0%{?suse_version} >= 1500
BuildRequires: libpoppler-devel >= 0.12 BuildRequires: libpoppler-devel >= 0.12
%else %else
BuildRequires: poppler-devel >= 0.12 BuildRequires: poppler-devel >= 0.12
@ -194,7 +194,7 @@ BuildRequires: trinity-poppler-devel >= 0.12
# POSTGRESQL support # POSTGRESQL support
# Requires 'libpqxx', for kexi-driver-pgqsl # Requires 'libpqxx', for kexi-driver-pgqsl
%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
%if 0%{?suse_version} != 1500 %if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550
%define with_postgresql 1 %define with_postgresql 1
BuildRequires: postgresql-devel BuildRequires: postgresql-devel
BuildRequires: libpqxx-devel BuildRequires: libpqxx-devel

@ -76,7 +76,7 @@ BuildRequires: fdupes
# POPPLER support # POPPLER support
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
%if 0%{?suse_version} == 1500 %if 0%{?suse_version} >= 1500
BuildRequires: libpoppler-devel >= 0.12 BuildRequires: libpoppler-devel >= 0.12
%else %else
BuildRequires: poppler-devel >= 0.12 BuildRequires: poppler-devel >= 0.12

@ -28,6 +28,7 @@ docbook-xsl-stylesheets
doxygen GraphicsMagick doxygen GraphicsMagick
dssi-devel dssi-devel
fdupes fdupes
ffmpeg-devel
fftw3-devel fftw3-devel
file-devel file-devel
flac-devel flac-devel
@ -138,6 +139,7 @@ libXxf86dga-devel
lilo lilo
lirc-devel lirc-devel
make make
makeinfo
meanwhile-devel meanwhile-devel
Mesa-devel Mesa-devel
Mesa-libGL-devel Mesa-libGL-devel
@ -159,6 +161,7 @@ pkcs11-helper-devel
postgresql postgresql
postgresql-devel postgresql-devel
python-devel python-devel
qt-devel
rpcgen rpcgen
rpm-build rpm-build
rsvg-view rsvg-view
@ -171,6 +174,7 @@ sqlite3-devel
subversion-devel subversion-devel
sudo sudo
swig swig
sword-devel
torsocks torsocks
transfig transfig
unixODBC-devel unixODBC-devel

@ -199,7 +199,7 @@ BuildRequires: OpenEXR-devel
%define with_pdf 1 %define with_pdf 1
%if 0%{?with_pdf} %if 0%{?with_pdf}
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
%if 0%{?suse_version} == 1500 %if 0%{?suse_version} >= 1500
BuildRequires: libpoppler-devel >= 0.12 BuildRequires: libpoppler-devel >= 0.12
%else %else
BuildRequires: poppler-devel >= 0.12 BuildRequires: poppler-devel >= 0.12

Loading…
Cancel
Save