RPM Packaging: lots of updates for 3.5.13.2

1 files changed, 41 insertions, 32 deletions

diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
index 54a443726..b98cb94b4 100644
--- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
+++ b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define tdecomp tdesvn
+%define tde_pkg tdesvn
+%define tde_version 3.5.13.2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
 %endif
 
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,26 +24,26 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tdecomp}
-Summary:	subversion client with tight KDE integration [Trinity]
-Version:	1.0.4
-Release:	5%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		subversion client with tight TDE integration [Trinity]
+Version:		1.0.4
+Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.elliptique.net/~ken/kima/
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.elliptique.net/~ken/kima/
 
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -57,13 +58,13 @@ TDESvn is a graphical client for the subversion revision control
 system (svn).
 
 Besides offering common and advanced svn operations, it features
-a tight integration into KDE and can be embedded into other KDE 
-applications like konqueror via the KDE component technology KParts.
+a tight integration into TDE and can be embedded into other TDE 
+applications like konqueror via the TDE component technology KParts.
 
 
 %package -n trinity-libsvnqt
-Group:		Development/Libraries
-Summary: Qt wrapper library for subversion [Trinity]
+Group:			Development/Libraries
+Summary:		Qt wrapper library for subversion [Trinity]
 
 %description -n trinity-libsvnqt
 This package provides svnqt, a Qt wrapper library around the 
@@ -73,11 +74,11 @@ It is based on the RapidSvn SvnCpp library, a subversion client API
 written in C++.
 
 %package -n trinity-libsvnqt-devel
-Group:		Development/Libraries
-Requires:	trinity-libsvnqt = %{version}-%{release}
-Requires:	qt-devel
-Requires:	subversion-devel
-Summary:	Qt wrapper library for subversion (development files) [Trinity]
+Group:			Development/Libraries
+Requires:		trinity-libsvnqt = %{version}-%{release}
+Requires:		qt-devel
+Requires:		subversion-devel
+Summary:		Qt wrapper library for subversion (development files) [Trinity]
 
 %description -n trinity-libsvnqt-devel
 This package contains the header files and symbolic links that developers
@@ -85,9 +86,9 @@ using svnqt will need.
 
 
 %package tdeio-plugins
-Group:		Development/Libraries
+Group:			Development/Libraries
 Conflicts:	trinity-kdesdk-tdeio-plugins
-Summary:	subversion I/O slaves for Trinity
+Summary:		subversion I/O slaves for Trinity
 
 Obsoletes:	trinity-kdesvn-kio-plugins < %{version}-%{release}
 Provides:	trinity-kdesvn-kio-plugins = %{version}-%{release}
@@ -108,7 +109,7 @@ This package is part of tdesvn-trinity.
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -141,6 +142,12 @@ cd build
 %endif
 
 %cmake \
+  -DCMAKE_BUILD_TYPE="" \
+  -DCMAKE_C_FLAGS="-DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  \
   -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
   -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
@@ -149,7 +156,6 @@ cd build
   -DDATA_INSTALL_DIR=%{tde_datadir} \
   -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
   ..
 
 # SMP safe !
@@ -162,8 +168,6 @@ export PATH="%{_bindir}:${PATH}"
 %__make install DESTDIR=%{buildroot} -C build
 
 
-%find_lang kdesvn
-
 # Installs SVN protocols as alternatives
 %__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn
 %__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn
@@ -176,6 +180,8 @@ export PATH="%{_bindir}:${PATH}"
 %__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
 %__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
 
+%find_lang %{tde_pkg}
+
 
 %clean
 %__rm -rf %{buildroot}
@@ -271,6 +277,9 @@ fi
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-6
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-5
 - Initial release for TDE 3.5.13.2