summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--opensuse/core/qt3/qt3-3.5.13.2.spec8
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec8
-rw-r--r--redhat/tdelibs/tdelibs-3.5.13.2.spec12
3 files changed, 20 insertions, 8 deletions
diff --git a/opensuse/core/qt3/qt3-3.5.13.2.spec b/opensuse/core/qt3/qt3-3.5.13.2.spec
index 4c78ad2f2..a50af8db8 100644
--- a/opensuse/core/qt3/qt3-3.5.13.2.spec
+++ b/opensuse/core/qt3/qt3-3.5.13.2.spec
@@ -79,9 +79,13 @@ BuildRequires: glu-devel
%endif
# PNG support
-%if %suse_version > 1220
+%if %suse_version >= 1310
+BuildRequires: libpng16-compat-devel
+%endif
+%if %suse_version >= 1210 && %suse_version < 1300
BuildRequires: libpng15-compat-devel
-%else
+%endif
+%if %suse_version >= 1110 && %suse_version < 1200
BuildRequires: libpng14-compat-devel
%endif
diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
index 532354e33..3aaa84439 100644
--- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
@@ -79,8 +79,6 @@ autoreconf --force --install --symlink
%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-
# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
@@ -96,13 +94,19 @@ fi
\
--disable-dependency-tracking
+# FIXME: bad libtool ??
+%if 0%{?rhel} == 5
+%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+%else
%__make %{?_smp_mflags}
+%endif
%install
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} LIBTOOL=$(which libtool)
+# Unwanted files
%__rm -f %{buildroot}%{tde_libdir}/libcarddav.a
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec
index 1bc70e518..727c8defd 100644
--- a/redhat/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec
@@ -198,12 +198,16 @@ BuildRequires: xz-devel
%endif
# Certificates support
-%if 0%{?rhel} || 0%{?fedora}
-%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
+%if 0%{?rhel} >= 6 || 0%{?fedora}
+%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
Requires: ca-certificates
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-%define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt
+%define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt
+Requires: openssl
+%endif
+%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
+%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
Requires: openssl
%endif
@@ -427,7 +431,7 @@ cd build
-DWITH_SUDO_KDESU_BACKEND=OFF \
%{?!with_lzma:-DWITH_LZMA=OFF} \
-DWITH_ASPELL=ON \
- %{?with_hspell:-DWITH_HSPELL=ON} \
+ %{?!with_hspell:-DWITH_HSPELL=OFF} \
..
%__make %{?_smp_mflags} || %__make