RPM: massive update and cleanup

2 files changed, 50 insertions, 164 deletions

diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
deleted file mode 100644
index e4099e05b..000000000
--- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
+++ /dev/null
@@ -1,138 +0,0 @@
-# Default version for this component
-%define tde_pkg kdiff3
-%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}/tde
-%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:		KDiff3 is a utility for comparing and/or merging two or three text files or directories.
-Version:		0.9.91
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-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
-
-
-%description
-Shows the differences line by line and character by character (!).
-Provides an automatic merge-facility and
-an integrated editor for comfortable solving of merge-conflicts.
-Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.).
-Unicode & UTF-8 support
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/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}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-# These are not HTML files but weird files in wrong place ??
-%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || :
-done
-
-%postun
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/kdiff3
-%{tde_datadir}/apps/kdiff3/
-%{tde_datadir}/apps/kdiff3part/
-%{tde_datadir}/icons/hicolor/*/apps/kdiff3.png
-%{tde_datadir}/icons/locolor/*/apps/kdiff3.png
-%{tde_tdedocdir}/HTML/*/kdiff3/
-%{tde_datadir}/services/kdiff3_plugin.desktop
-%{tde_datadir}/services/kdiff3part.desktop
-%{tde_datadir}/applnk/Development/*.desktop
-%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop
-%{tde_mandir}/man*/*
-%{tde_tdelibdir}/libkdiff3part.la
-%{tde_tdelibdir}/libkdiff3part.so
-%{tde_tdelibdir}/libkdiff3plugin.la
-%{tde_tdelibdir}/libkdiff3plugin.so
-
-%changelog
diff --git a/redhat/applications/kdiff3/kdiff3-14.0.0.spec b/redhat/applications/kdiff3/kdiff3.spec
index 50a13a04c..964ca2151 100644
--- a/redhat/applications/kdiff3/kdiff3-14.0.0.spec
+++ b/redhat/applications/kdiff3/kdiff3.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 kdiff3
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -70,6 +70,15 @@ BuildRequires:	libtool
 BuildRequires:	update-desktop-files
 %endif
 
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
 
 %description
 Shows the differences line by line and character by character (!).
@@ -91,52 +100,66 @@ Unicode & UTF-8 support
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kdiff3.desktop" Development RevisionControl
+%endif
 
 # Unwanted files
 # These are not HTML files but weird files in wrong place ??
 %__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/
 
 %find_lang %{tde_pkg}
+%find_lang %{tde_pkg}_plugin
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f %{tde_pkg}.lang -f %{tde_pkg}_plugin.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{tde_bindir}/kdiff3
@@ -144,10 +167,11 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/apps/kdiff3part/
 %{tde_datadir}/icons/hicolor/*/apps/kdiff3.png
 %{tde_datadir}/icons/locolor/*/apps/kdiff3.png
+%{tde_docdir}/kdiff3/
 %{tde_tdedocdir}/HTML/*/kdiff3/
 %{tde_datadir}/services/kdiff3_plugin.desktop
 %{tde_datadir}/services/kdiff3part.desktop
-%{tde_datadir}/applnk/Development/*.desktop
+%{tde_tdeappdir}/kdiff3.desktop
 %{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop
 %{tde_mandir}/man*/*
 %{tde_tdelibdir}/libkdiff3part.la