RPM: massive update and cleanup

2 files changed, 7 insertions, 153 deletions

diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec
deleted file mode 100644
index d9b8d3d35..000000000
--- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec
+++ /dev/null
@@ -1,146 +0,0 @@
-# Default version for this component
-%define tde_pkg ksquirrel
-%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
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Powerful Trinity image viewer
-Version:		0.8.0
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Amusements/Games
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <[email protected]>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-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
-
-BuildRequires:	gettext
-BuildRequires:	trinity-libkipi-devel
-BuildRequires:	trinity-libksquirrel-devel
-#BuildRequires:	libkexif-devel
-
-%description
-KSquirrel is an image viewer for TDE with disk navigator, file tree,
-multiple directory view, thumbnails, extended thumbnails, dynamic
-format support, DCOP interface, KEXIF and KIPI plugins support.
-
-KSquirrel is a fast and convenient image viewer for TDE featuring
-OpenGL and dynamic format support.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO
-%{tde_bindir}/ksquirrel
-%{tde_bindir}/ksquirrel-libs-configurator
-%{tde_bindir}/ksquirrel-libs-configurator-real
-%{tde_tdelibdir}/libksquirrelpart.la
-%{tde_tdelibdir}/libksquirrelpart.so
-%{tde_tdeappdir}/ksquirrel.desktop
-%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
-%{tde_datadir}/apps/ksquirrel/
-%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc
-%{tde_datadir}/config/magic/x-ras.magic
-%{tde_datadir}/config/magic/x-sun.magic
-%{tde_datadir}/config/magic/x-utah.magic
-%{tde_tdedocdir}/HTML/*/ksquirrel
-%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png
-%{tde_datadir}/mimelnk/image/*.desktop
-%{tde_datadir}/services/ksquirrelpart.desktop
-%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo
-%{tde_mandir}/man1/ksquirrel.1
-
-%changelog
diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel.spec
index 0a12ea867..fc17cceda 100644
--- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
+++ b/redhat/applications/ksquirrel/ksquirrel.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg ksquirrel
 %define tde_prefix /opt/trinity
@@ -179,17 +179,17 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
 %{tde_datadir}/apps/ksquirrel/
 %{tde_datadir}/apps/ksquirrelpart/
-%{tde_confdir}/magic/x-ras.magic
-%{tde_confdir}/magic/x-sun.magic
-%{tde_confdir}/magic/x-utah.magic
+%config(noreplace) %{tde_confdir}/magic/x-ras.magic
+%config(noreplace) %{tde_confdir}/magic/x-sun.magic
+%config(noreplace) %{tde_confdir}/magic/x-utah.magic
 %{tde_tdedocdir}/HTML/*/ksquirrel
 %{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png
 %{tde_datadir}/mimelnk/image/*.desktop
 %{tde_datadir}/services/ksquirrelpart.desktop
 %{tde_mandir}/man1/ksquirrel.1
-%{tde_confdir}/magic/x-ras.magic.mgc
-%{tde_confdir}/magic/x-sun.magic.mgc
-%{tde_confdir}/magic/x-utah.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/x-ras.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/x-sun.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/x-utah.magic.mgc
 
 
 %changelog