From 9fa64ea299a4b71ba92c72d89440d2ba316015c3 Mon Sep 17 00:00:00 2001
From: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>
Date: Tue, 22 Sep 2026 06:27:40 -0300
Subject: RPM kvirc: update packaging for TDE master
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RPM kvirc: update packaging for TDE master

Consolidate the final validated packaging changes for kvirc from the Tumbleweed build series.

Original commits represented: 9.

Signed-off-by: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>
---
 redhat/applications/internet/kvirc/kvirc.spec | 89 ++++++++++-----------------
 1 file changed, 33 insertions(+), 56 deletions(-)

diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec
index 1c7df0fc9..a8d09fd5c 100644
--- a/redhat/applications/internet/kvirc/kvirc.spec
+++ b/redhat/applications/internet/kvirc/kvirc.spec
@@ -62,10 +62,9 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -142,64 +141,43 @@ with the K Desktop Environment version 3.
 %endif
 
 
-%__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" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-./autogen.sh
-
-
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-%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 \
-  --enable-wall \
-  \
-  --with-pic \
-  \
-  --with-big-channels \
-  --enable-perl \
-  --with-ix86-asm \
-  --with-kde-services-dir=%{tde_datadir}/services \
-  --with-kde-library-dir=%{tde_libdir} \
-  --with-kde-include-dir=%{tde_tdeincludedir} \
-  --with-tqt-name=tqt \
-  --with-tqt-library-dir=%{_libdir} \
-  --with-tqt-include-dir=%{_includedir}/tqt3 \
-  --with-tqt-moc=%{_bindir}/tmoc
-
-# Symbolic links must exist prior to parallel building
-%__make symlinks -C src/kvilib/build
-%__make symlinks -C src/kvirc/build
-
-%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
-%__sed -i "src/modules/"*"/Makefile" -e "s|-Wl,--no-undefined||"
-%endif
-
-%__make %{?_smp_mflags} || %__make
+%cmake \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DCMAKE_INSTALL_RPATH=%{tde_libdir} \
+  -DWITH_ALL_OPTIONS=OFF \
+  -DWITH_GCC_VISIBILITY=OFF \
+  -DWITH_TDE=ON \
+  -DWITH_BIG_CHANNELS=ON \
+  -DWITH_CRYPT=ON \
+  -DWITH_INFO_TIPS=ON \
+  -DWITH_IPC=ON \
+  -DWITH_IPV6=ON \
+  -DWITH_PERL=ON \
+  -DWITH_SSL=ON \
+  -DWITH_SYSTEM_MEMMOVE=ON \
+  -DWITH_TRANSPARENCY=ON \
+  -DWITH_ZLIB=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON
+
+%__make %{?_smp_mflags}
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Move desktop file to XDG location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+%__make install DESTDIR=%{buildroot} -C build
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
-%suse_update_desktop_file kvirc Network IRCClient
+%suse_update_desktop_file %{buildroot}%{tde_tdeappdir}/kvirc.desktop Network IRCClient
 %endif
 
 
@@ -212,33 +190,32 @@ export PATH="%{tde_bindir}:${PATH}"
 %doc ChangeLog FAQ README TODO
 %{tde_bindir}/kvirc
 %{tde_libdir}/*.so.*
-%{tde_libdir}/kvirc/*/modules/*.so
+%{tde_libdir}/kvirc/modules/*.so
 
 %files data
 %defattr(-,root,root,-)
 %{tde_bindir}/kvi_run_netscape
 %{tde_bindir}/kvi_search_help
-%exclude %{tde_libdir}/kvirc/*/modules/*.la
-%exclude %{tde_libdir}/kvirc/*/modules/*.so
+%exclude %{tde_libdir}/kvirc/modules/*.la
+%exclude %{tde_libdir}/kvirc/modules/*.so
 %{tde_libdir}/kvirc/
 %{tde_tdeappdir}/kvirc.desktop
 %{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem.upd
 %{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem_upd.sh
+%{tde_datadir}/apps/kvirc/
 %{tde_datadir}/icons/hicolor/*/*/*.png
 %{tde_datadir}/icons/hicolor/*/*/*.svgz
 %{tde_datadir}/icons/hicolor/*/*/*.xpm
-%{tde_datadir}/kvirc
+%{tde_datadir}/locale/*/LC_MESSAGES/kvirc*.mo
 %{tde_datadir}/mimelnk/text/*.desktop
-%{tde_datadir}/services/*.protocol
 %{tde_mandir}/man1/kvirc.1
 
 %files devel
 %defattr(-,root,root,-)
-%{tde_bindir}/kvirc-config
-%{tde_includedir}/kvirc/
+%{tde_tdeincludedir}/kvirc/
 %{tde_libdir}/*.la
 %{tde_libdir}/*.so
-%{tde_libdir}/kvirc/*/modules/*.la
+%{tde_libdir}/kvirc/modules/*.la
 
 
 %changelog
-- 
cgit v1.2.3