RPM Packaging: lots of updates for 3.5.13.2

1 files changed, 19 insertions, 24 deletions

diff --git a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
index 623550984..cd6a53ad2 100644
--- a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
+++ b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
@@ -3,7 +3,9 @@
 %define _variant .opt
 %endif
 
-# TDE 3.5.13 specific building variables
+%define tde_version 3.5.13.2
+
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -19,8 +21,9 @@
 
 
 Name:		trinity-tdegraphics
-Version:	3.5.13.2
-Release:	1%{?dist}%{?_variant}
+Version:	%{tde_version}
+Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+
 License:	GPL
 Summary:    Trinity Desktop Environment - Graphics Applications
 
@@ -33,9 +36,9 @@ URL:		http://www.trinitydesktop.org/
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-%{version}.tar.gz
+Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
-# TDE 3.5.13
+# TDE
 ## RHEL / Fedora specific patches
 # [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5
 Patch3:		kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
@@ -1228,7 +1231,7 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
 ##########
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %if 0%{?rhel} && 0%{?rhel} <= 5
 %patch3 -p1 -b .mkstemps
@@ -1262,13 +1265,19 @@ 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_tdeincludedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DCMAKE_SKIP_RPATH="OFF" \
+  \
   %{?with_t1lib:-DWITH_T1LIB=ON} \
   %{?with_paper:-DWITH_LIBPAPER=ON} \
   -DWITH_TIFF=ON \
@@ -1287,23 +1296,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-# locale's
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
 # rpmdocs
 for dir in k* ; do
   for file in AUTHORS ChangeLog README TODO ; do
@@ -1320,5 +1312,8 @@ done
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
 - Initial release for TDE 3.5.13.2