Small updates for kdelibs & kdesdk

redhat/kdelibs/trinity-kdelibs-3.5.12.spec

@@ -1,13 +1,24 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%endif
+%define release 5
+
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
 %define _docdir %{_prefix}/share/doc
 %endif
 
+# TDE 3.5.13 specific variables
+BuildRequires:	autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_libdir %{_libdir}/kde3
+
 
 Name:		trinity-kdelibs
-Version:	3.5.12
+Version:	%{version}
-Release:	5%{?dist}%{?_variant}
+Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
@@ -16,7 +27,7 @@ Summary:	Trinity KDE Libraries
 Source0:	kdelibs-%{version}.tar.gz
 Prefix:		%{_prefix}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
 BuildRequires:	qt3-devel
@@ -59,10 +70,12 @@ format for easy browsing
 
 %prep
 %setup -q -n kdelibs
+
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
 %__make -f admin/Makefile.common 
 
+
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
@@ -94,6 +107,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 # Do NOT use %{?_smp_mflags} for this package, or it will fail to build !
 %__make
 
+
 %install
 %__rm -rf %{?buildroot}
 %__mkdir_p %{?buildroot}
@@ -104,7 +118,7 @@ cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
 %if "%{?_prefix}" != "/usr"
 %{_libdir}
 %endif
-%{_libdir}/trinity
+%{tde_libdir}
 EOF
 
 %clean

redhat/kdelibs/trinity-kdelibs-3.5.13.spec

@@ -2,6 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
+%define release 0
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -9,10 +10,15 @@
 %define _docdir %{_prefix}/share/doc
 %endif
 
+# TDE 3.5.13 specific variables
+BuildRequires: cmake >= 2.8
+%define tde_docdir %{_docdir}/kde
+%define tde_libdir %{_libdir}/trinity
+
 
 Name:		trinity-kdelibs
 Version:	%{version}
-Release:	0%{?dist}%{?_variant}
+Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
@@ -21,7 +27,6 @@ Summary:	Trinity KDE Libraries
 Source0:	kdelibs-%{version}.tar.gz
 Prefix:		%{_prefix}
 
-BuildRequires:	cmake >= 2.8
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
@@ -66,6 +71,7 @@ format for easy browsing
 %prep
 %setup -q -n kdelibs
 
+
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
@@ -94,6 +100,7 @@ cd build
 
 %__make %{?_smp_mflags}
 
+
 %install
 %__rm -rf %{?buildroot}
 %__mkdir_p %{?buildroot}

redhat/kdesdk/trinity-kdesdk-3.5.12.spec

@@ -1,4 +1,4 @@
-# If _kde3_prefix is # Default version for this component
+# Default version for this component
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
@@ -98,9 +98,9 @@ Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: trinity-kdelibs >= %{version}
 # helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name} < %{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 

redhat/kdesdk/trinity-kdesdk-3.5.13.spec

@@ -1,4 +1,4 @@
-# If _kde3_prefix is # Default version for this component
+# Default version for this component
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
@@ -11,18 +11,11 @@
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
-%define tde_docdir %{_docdir}
+%define tde_docdir %{_docdir}/kde
 %define tde_libdir %{_libdir}/trinity
 
 
-%define _with_subversion --with-subversion
-%if 0%{?fedora} > 6 || 0%{?rhel} > 4
-%define _with_apr_config --with-apr-config=apr-1-config
-%define _with_apu_config --with-apu-config=apu-1-config
-%endif
-
-
 Name:    trinity-kdesdk
 Summary: The KDE Software Development Kit (SDK)
 Version: %{?version}
@@ -43,7 +36,7 @@ Provides: kdesdk3 = %{version}-%{release}
 
 Requires: %{name}-libs = %{version}-%{release}
 
-BuildRequires: automake libtool
+BuildRequires: libtool
 BuildRequires: tqtinterface-devel
 BuildRequires: pcre-devel
 BuildRequires: trinity-kdelibs-devel
@@ -55,11 +48,9 @@ BuildRequires: desktop-file-utils
 BuildRequires: flex
 # umbrello
 BuildRequires: libxslt-devel libxml2-devel
-%if 0%{?fedora} > 5 || 0%{?rhel} > 4
 BuildRequires: binutils-devel
-%endif
 BuildRequires: perl
-%{?_with_subversion:BuildRequires: subversion-devel neon-devel}
+BuildRequires: subversion-devel neon-devel
 
 # Obsoletes/Provides
 %define cervisia_ver 2.4.7
@@ -94,9 +85,9 @@ Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: trinity-kdelibs >= %{version}
 # helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name} < %{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
@@ -105,42 +96,29 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %setup -q -n kdesdk
 %patch1 -p1 -b .subversion
 
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-sed -i admin/acinclude.m4.in \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
-
 
 %build
 unset QTDIR || :; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export LD_LIBRARY_PATH="%{_libdir}"
-export LDFLAGS="${LDFLAGS} -lqt-mt -L${QTLIB}"
+export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
 
-%configure \
+%__mkdir build
-  --includedir=%{_includedir}/kde \
+cd build
-  --disable-rpath \
+%cmake \
-  --enable-new-ldflags \
+  -DWITH_DBSEARCHENGINE=OFF \
-  --disable-debug --disable-warnings \
+  -DBUILD_ALL=ON \
-  --disable-dependancy-tracking --enable-final \
+  ..
-  %{?_with_subversion} %{?_with_apr_config} %{?_with_apu_config} \
-  --with-extra-includes=%{_includedir}/tqt \
-  --without-svn \
-  --enable-closure
 
-# Do not use %{?_smp_mflags} !
+%__make %{?_smp_mflags}
-%__make
 
 
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot} 
 
-%make_install
+%make_install -C build
 
 desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/kde \