From ac710e2353c9dc661cdc8839d7aa2adb6476a0ab Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Tue, 22 Sep 2026 06:25:12 -0300 Subject: RPM kmyfirewall: update packaging for TDE master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RPM kmyfirewall: update packaging for TDE master Consolidate the final validated packaging changes for kmyfirewall from the Tumbleweed build series. Original commits represented: 9. Signed-off-by: Sebastião Guerra --- .../settings/kmyfirewall/kmyfirewall.spec | 44 +++++++++------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec index 16d3e34ca..c2a518819 100644 --- a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec +++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec @@ -90,7 +90,7 @@ configure your rule set one time and then you can use it on several computers giving each of them a similar configuration (p.e. school networks, office, university etc.) -%files +%files -f %{tde_pkg}-all.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO %{tde_bindir}/kmyfirewall @@ -140,6 +140,7 @@ university etc.) %{tde_tdedocdir}/HTML/en/kmyfirewall/ %{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png %{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png +%{tde_datadir}/pixmaps/kmyfirewall.xpm %{tde_datadir}/mimelnk/application/kmfgrs.desktop %{tde_datadir}/mimelnk/application/kmfnet.desktop %{tde_datadir}/mimelnk/application/kmfpkg.desktop @@ -177,44 +178,35 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/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" -%__make -f "admin/Makefile.common" - - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export kde_confdir="%{tde_confdir}" -%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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} +%cmake \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DWITH_GCC_VISIBILITY=OFF \ + -DBUILD_TRANSLATIONS=ON + +%__make -j1 %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} +%find_lang kmfsystray +cat %{tde_pkg}.lang kmfsystray.lang > %{tde_pkg}-all.lang # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file -r "%{tde_pkg}" System Network +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kmyfirewall.desktop" System Network %endif -- cgit v1.2.3