RPM: massive update and cleanup

3 files changed, 47 insertions, 155 deletions

diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch
deleted file mode 100644
index 4ed8c1c52..000000000
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp.ORI	2013-07-20 11:16:18.010011618 +0200
-+++ trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp	2013-07-20 11:27:19.135889426 +0200
-@@ -231,9 +231,10 @@
- 	}
- 
- 	// Send a notification request to KDE here...
--	TQString messageText = TQString(body);
-+	TQString messageCaption = TQString::fromLocal8Bit(summary);
-+	TQString messageText = TQString::fromLocal8Bit(body);
- 
--	GTKNotifierContainer->displayMessage(TQString(summary), TQString(body), TQString(icon), x, y);
-+	GTKNotifierContainer->displayMessage(messageCaption, messageText, TQString(icon), x, y);
- 
- 	return_id = 0;
- 
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
deleted file mode 100644
index 36202497b..000000000
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
+++ /dev/null
@@ -1,117 +0,0 @@
-# Default version for this component
-%define tde_pkg kdbusnotification
-%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:		a DBUS notification service [Trinity]
-
-Version:		0.1
-Release:		%{?!preversion:6}%{?preversion:5_%{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
-
-Patch1:			kdbusnotification-3.5.13.2-fix_utf8.patch
-
-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:	gtk2-devel
-
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-glib-devel
-%else
-BuildRequires:	dbus-glib-devel
-%endif
-
-%description
-kdbusnotification is a small program for Trinity that displays
-DBUS notifications via unobtrusive, easily dismissed passive popups.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .utf8
-
-%__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}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --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}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/notification-daemon-tde
-%{tde_datadir}/autostart/kdbusnotification-autostart.desktop
-
-
-
-%changelog
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification.spec
index 25fbabe11..28fb3058d 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification.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 kdbusnotification
 %define tde_prefix /opt/trinity
@@ -59,7 +59,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
@@ -84,6 +84,15 @@ BuildRequires:	dbus-1-glib-devel
 BuildRequires:	dbus-glib-devel
 %endif
 
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
 
 %description
 kdbusnotification is a small program for Trinity that displays
@@ -102,38 +111,53 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
 %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} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+# Fix for Fedora 31
+if [ -r "/usr/include/harfbuzz/hb.h" ]; then
+  #export CMAKE_INCLUDE_PATH="/usr/include/harfbuzz"
+  RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/harfbuzz"
+fi
+
+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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  ..
 
-%__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