diff options
| author | François Andriot <albator78@libertysurf.fr> | 2022-11-06 11:46:08 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2022-11-06 16:15:02 +0100 |
| commit | b504f7ef7837e88d471f3601da710a92d58108a0 (patch) | |
| tree | 2874f5894582ac03efd73e22d0a374cc97d33cac /redhat/main/tdenetwork/tdenetwork.spec | |
| parent | 91c340e19d9a2c81194e7adb5900c8f69bbd7735 (diff) | |
| download | tde-packaging-b504f7ef7837e88d471f3601da710a92d58108a0.tar.gz tde-packaging-b504f7ef7837e88d471f3601da710a92d58108a0.zip | |
RPM: updates (cherry-pick from TDE R14.0.13)
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/main/tdenetwork/tdenetwork.spec')
| -rw-r--r-- | redhat/main/tdenetwork/tdenetwork.spec | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec index c7681f983..f519297af 100644 --- a/redhat/main/tdenetwork/tdenetwork.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -137,7 +137,7 @@ BuildRequires: pcre-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -252,6 +252,14 @@ BuildRequires: speex-devel %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_consolehelper 1 +# XINETD support +%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 +# No xinetd +%else +%define with_xinetd 1 +Requires: xinetd +%endif + # Avoids relinking, which breaks consolehelper %define dont_relink 1 %endif @@ -433,6 +441,7 @@ basic as well as advanced queries. %{tde_datadir}/apps/kicker/applets/kdictapplet.desktop %{tde_datadir}/icons/hicolor/*/apps/kdict.* %{tde_tdedocdir}/HTML/en/kdict +%{tde_mandir}/man1/kdict.1* ########## @@ -492,6 +501,7 @@ applications and Netscape. %{tde_datadir}/sounds/KGet_Finished_All.ogg %{tde_datadir}/sounds/KGet_Started.ogg %{tde_tdedocdir}/HTML/en/kget +%{tde_mandir}/man1/kget.1* ########## @@ -721,6 +731,7 @@ Support for more IM protocols can be added through a plugin system. %{tde_libdir}/libkopete_msn_shared.so.0 %{tde_libdir}/libkopete_msn_shared.so.0.0.0 %endif +%{tde_mandir}/man1/kopete.1* ########## @@ -918,7 +929,7 @@ Summary: Talk daemon for Trinity Group: Applications/Internet Requires: trinity-kcontrol >= %{tde_version} Requires: trinity-tdebase-data >= %{tde_version} -%if 0%{?fedora} == 0 || 0%{?fedora} <= 33 +%if 0%{?with_xinetd} Requires: xinetd %endif @@ -938,10 +949,10 @@ and shouldn't be run on a multi-user machine. %{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png %{tde_datadir}/icons/hicolor/*/apps/ktalkd.png %{tde_datadir}/sounds/ktalkd.wav -%if 0%{?fedora} == 0 || 0%{?fedora} <= 30 +%if 0%{?with_xinetd} %dir %{_sysconfdir}/xinetd.d -%endif %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk +%endif %{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd %{tde_tdedocdir}/HTML/en/ktalkd @@ -974,6 +985,7 @@ wavelan card that uses the wireless extensions interface. %{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz %{tde_tdedocdir}/HTML/en/kwifimanager/ %{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/ +%{tde_mandir}/man1/kwifimanager.1* %endif @@ -1024,6 +1036,8 @@ but relying only on the TCP/IP protocol. %{tde_datadir}/services/rlan.protocol %{tde_bindir}/lisa %{tde_bindir}/reslisa +%{tde_mandir}/man8/lisa.8* +%{tde_mandir}/man8/reslisa.8* ########## @@ -1167,8 +1181,10 @@ if [ -r "%{?buildroot}%{tde_bindir}/kppp" ]; then chmod 0755 "%{?buildroot}%{tde_bindir}/kppp" fi +%if 0%{?with_xinetd} # ktalk %__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk +%endif # Avoids conflict with trinity-kvirc %__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/ |