RPM Packaging: update packages for 3.5.13.2 under Fedora 19

1 files changed, 11 insertions, 16 deletions

diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
index daea3460d..9e08d202f 100644
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
+++ b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
@@ -27,7 +27,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		Quick picture viewer for TDE 
 Version:		0.8.13
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
 
 License:		GPLv2+
 Group:			Applications/Utilities
@@ -41,6 +41,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
@@ -66,12 +67,6 @@ Clicking on an image shows the image in its normal size.
 %prep
 %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 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
@@ -80,7 +75,6 @@ Clicking on an image shows the image in its normal size.
 %build
 unset QTDIR; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -93,12 +87,10 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   \
   --disable-dependency-tracking \
   --disable-debug \
-  --enable-new-ldflags \
   --enable-final \
+  --enable-new-ldflags \
   --enable-closure \
-  --disable-rpath \
-  \
-  --with-extra-includes=%{tde_includedir}/tqt
+  --enable-rpath
 
 %__make %{?_smp_mflags}
 
@@ -126,18 +118,21 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{tde_bindir}/*
+%{tde_bindir}/kuickshow
 %{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
+%{tde_datadir}/apps/kuickshow/
 %{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/lib[kt]deinit_%{tde_pkg}.so
+%{tde_libdir}/libkdeinit_%{tde_pkg}.so
 %{tde_libdir}/*.la
 %{tde_tdelibdir}/*.so
 %{tde_tdelibdir}/*.la
-%{tde_tdedocdir}/HTML/en/*/
+%{tde_tdedocdir}/HTML/en/kuickshow/
 
 
 %changelog
+* Fri Aug 16 2013 Francois Andriot <[email protected]> - 0.8.13-8
+- Build for Fedora 19
+
 * Sun Jul 28 2013 Francois Andriot <[email protected]> - 0.8.13-7
 - Rebuild with NDEBUG option