RPM Packaging: update for opensuse 13.1

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
 

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
 
 

redhat/tdelibs/tdelibs-3.5.13.2.spec

@@ -198,7 +198,7 @@ BuildRequires:	xz-devel
 %endif
 
 # Certificates support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} >= 6 || 0%{?fedora}
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
 Requires:		ca-certificates
 %endif
@@ -206,6 +206,10 @@ Requires:		ca-certificates
 %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
 
 # Trinity dependencies
 Requires:		qt3 >= 3.3.8.d
@@ -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