summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-12-31 12:26:47 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2015-12-31 12:26:47 +0100
commit5400f0ed760fd9924c19cc9fa2e150039ae201a3 (patch)
tree7fc2ad27252f2b0325dcfbf73dfbd2c8a5987f66 /redhat
parent7f4eeaf4f2bd823bb25a77277de258dac88b8179 (diff)
downloadtde-packaging-5400f0ed760fd9924c19cc9fa2e150039ae201a3.tar.gz
tde-packaging-5400f0ed760fd9924c19cc9fa2e150039ae201a3.zip
RPM Packaging: minor fixes for openSUSE TumbleWeed
Diffstat (limited to 'redhat')
-rw-r--r--redhat/applications/kbiff/kbiff-14.0.0.spec2
-rw-r--r--redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec2
-rw-r--r--redhat/applications/kstreamripper/kstreamripper-14.0.0.spec1
-rw-r--r--redhat/extras/fileshareset/fileshareset.spec4
-rw-r--r--redhat/main/tdebase/tdebase-14.0.0.spec3
-rw-r--r--redhat/main/tdebindings/tdebindings-14.0.0.spec9
6 files changed, 16 insertions, 5 deletions
diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec
index ec7965ca0..c825bae95 100644
--- a/redhat/applications/kbiff/kbiff-14.0.0.spec
+++ b/redhat/applications/kbiff/kbiff-14.0.0.spec
@@ -122,7 +122,7 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
-
+
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
index 58bed50f6..aa9ccb0d3 100644
--- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
+++ b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
@@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.8.1
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary: A FTP client for TDE.
+Summary: A FTP client for TDE
Group: Applications/Internet
URL: http://www.kftp.org/
diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index 6d1570269..d7ac6a5ab 100644
--- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
@@ -76,6 +76,7 @@ BuildRequires: brp-check-trinity
%endif
BuildRequires: scons
+BuildRequires: python
%description
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index 482c69760..1e66c4d4a 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -51,6 +51,10 @@ BuildRequires: gcc-c++
#Requires:
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
%description
This package contains the the fileshareset utility to allow users to
add or remove file shares. It's also possible to list currently shared
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index 2c8c0b313..8473edf0a 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -397,6 +397,9 @@ BuildRequires: libsensors4-devel
# TSAK support (requires libudev-devel)
# 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%{?suse_version} >= 1310
+BuildRequires: udev
+%endif
BuildRequires: libudev-devel
%define with_tsak 1
%define with_tdehwlib 1
diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec
index 205048bc6..d43a59b54 100644
--- a/redhat/main/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec
@@ -1110,18 +1110,21 @@ if [ -d "/usr/include/%{_normalized_cpu}-linux" ]; then
fi
# 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}"
fi
-if [ -d /usr/evolution28 ]; then
+if [ -d "/usr/evolution28" ]; then
export PATH="/usr/evolution28/bin:${PATH}"
export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
fi
# 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}"
%endif
+%if 0%{?suse_version} >= 1330
+EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}"
+%endif
# Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \