RPM Packaging: minor fixes for openSUSE TumbleWeed

pull/3/head
François Andriot 9 years ago
parent 7f4eeaf4f2
commit 5400f0ed76

@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch} Epoch: %{tde_epoch}
Version: 0.8.1 Version: 0.8.1
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: A FTP client for TDE. Summary: A FTP client for TDE
Group: Applications/Internet Group: Applications/Internet
URL: http://www.kftp.org/ URL: http://www.kftp.org/

@ -76,6 +76,7 @@ BuildRequires: brp-check-trinity
%endif %endif
BuildRequires: scons BuildRequires: scons
BuildRequires: python
%description %description

@ -51,6 +51,10 @@ BuildRequires: gcc-c++
#Requires: #Requires:
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
%description %description
This package contains the the fileshareset utility to allow users to This package contains the the fileshareset utility to allow users to
add or remove file shares. It's also possible to list currently shared add or remove file shares. It's also possible to list currently shared

@ -397,6 +397,9 @@ BuildRequires: libsensors4-devel
# TSAK support (requires libudev-devel) # TSAK support (requires libudev-devel)
# On RHEL5, udev is built statically, so TSAK cannot build. # On RHEL5, udev is built statically, so TSAK cannot build.
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
%if 0%{?suse_version} >= 1310
BuildRequires: udev
%endif
BuildRequires: libudev-devel BuildRequires: libudev-devel
%define with_tsak 1 %define with_tsak 1
%define with_tdehwlib 1 %define with_tdehwlib 1

@ -1110,18 +1110,21 @@ if [ -d "/usr/include/%{_normalized_cpu}-linux" ]; then
fi fi
# Specific path for RHEL4 # Specific path for RHEL4
if [ -d /usr/X11R6 ]; then if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
if [ -d /usr/evolution28 ]; then if [ -d "/usr/evolution28" ]; then
export PATH="/usr/evolution28/bin:${PATH}" export PATH="/usr/evolution28/bin:${PATH}"
export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
fi fi
# Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h # Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h
%if 0%{?suse_version} >= 1310 %if 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320
EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}" EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}"
%endif %endif
%if 0%{?suse_version} >= 1330
EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}"
%endif
# Warning: GCC visibility causes FTBFS [Bug #1285] # Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \ %configure \

Loading…
Cancel
Save