diff options
Diffstat (limited to 'redhat/main/tdenetwork/tdenetwork.spec')
| -rw-r--r-- | redhat/main/tdenetwork/tdenetwork.spec | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec index 06a5369c0..c7681f983 100644 --- a/redhat/main/tdenetwork/tdenetwork.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -175,12 +175,9 @@ BuildRequires: libXxf86vm-devel ## Conditional build: # RHEL6: xmms is outdated ! #define _with_xmms --with-xmms -%ifnarch s390 s390x -%define _with_wifi --with-wifi -%endif # Wifi support -%if "%{?_with_wifi:1}" == "1" +%define with_wifi 1 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 BuildRequires: wireless-tools-devel %endif @@ -193,7 +190,6 @@ BuildRequires: wireless-tools %if 0%{?suse_version} || 0%{?mgaversion} >= 3 BuildRequires: libiw-devel %endif -%endif # OpenSLP support %if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} @@ -288,7 +284,9 @@ Requires: trinity-krdc = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-krfb = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-ktalkd = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?with_wifi} Requires: trinity-kwifimanager = %{?epoch:%{epoch}:}%{version}-%{release} +%endif Requires: trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-lisa = %{?epoch:%{epoch}:}%{version}-%{release} @@ -311,7 +309,9 @@ Networking applications, including: * krfb: Desktop Sharing server, allow others to access your desktop via VNC * ksirc: IRC client for Trinity * ktalkd: Talk daemon for Trinity +%if 0%{?with_wifi} * kwifimanager: Wireless lan manager for Trinity +%endif * librss: RSS library for Trinity * lisa: lan information server @@ -947,7 +947,8 @@ and shouldn't be run on a multi-user machine. ########## -%if "%{?_with_wifi:1}" == "1" +%if 0%{?with_wifi} + %package -n trinity-kwifimanager Summary: Wireless lan manager for Trinity Group: Applications/Internet @@ -973,6 +974,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/ + %endif ########## @@ -1064,8 +1066,10 @@ A tdeioslave and tded module that provide Zeroconf support. Try # Workaround libiw detection failure on opensuse %if 0%{?suse_version} +%if 0%{?with_wifi} %__sed -i "wifi/ConfigureChecks.cmake" -e "s|^check_library_exists.*|set( HAVE_IW 1 )|" %endif +%endif # Update icons for some control center modules %__sed -i "filesharing/simple/fileshare.desktop" -e "s|^Icon=.*|Icon=kcmfileshare|" @@ -1115,6 +1119,7 @@ fi %{!?build_kopete_motionaway:-DBUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY=OFF} \ %{!?with_gadu:-DBUILD_KOPETE_PROTOCOL_GADU=OFF} \ %{!?with_meanwhile:-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF} \ + %{!?with_wifi:-DBUILD_WIFI=OFF} \ .. # Tdenetwork is not smp safe ! @@ -1177,6 +1182,12 @@ for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do fi done +# Remove unwanted doc +%if 0%{?with_wifi} == 0 +%__rm -rf "%{buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/" +%__rm -rf "%{buildroot}%{tde_tdedocdir}/HTML/en/kwifimanager/" +%endif + # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file kcmkrfb @@ -1189,8 +1200,10 @@ done %suse_update_desktop_file -r krdc System RemoteAccess %suse_update_desktop_file -r krfb System RemoteAccess %suse_update_desktop_file -r kget System TrayIcon +%if 0%{?with_wifi} %suse_update_desktop_file -r kwifimanager System Network %suse_update_desktop_file kcmwifi +%endif %suse_update_desktop_file -u knewsticker-standalone Network News %suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/remoteview/zeroconf.desktop %endif |