diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-11-11 13:45:24 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-11-11 13:45:24 +0100 |
| commit | 1d291f7e10cbc00e96727f29490568c61632c5d6 (patch) | |
| tree | 24d8745b441dedac2c552d1e3639919abcbe2235 /redhat | |
| parent | 2287083270215dda616235fa6d9c1498e05e98a0 (diff) | |
| download | tde-packaging-1d291f7e10cbc00e96727f29490568c61632c5d6.tar.gz tde-packaging-1d291f7e10cbc00e96727f29490568c61632c5d6.zip | |
RPM packaging: update tdenetwork
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/main/tdenetwork/tdenetwork-14.0.0.spec | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec index f9ff8396c..f28fb6dca 100644 --- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec @@ -124,9 +124,22 @@ BuildRequires: libXtst-devel BuildRequires: libxtst-devel %endif +# XMU support +%if 0%{?suse_version} == 1140 +BuildRequires: xorg-x11-libXmu-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210 +BuildRequires: libXmu-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} >= 4 +BuildRequires: libxmu-devel +%endif +%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 +BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel +%endif + # Other stuff %if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 -BuildRequires: libXmu-devel BuildRequires: libXScrnSaver-devel BuildRequires: libXxf86vm-devel %endif @@ -1160,11 +1173,6 @@ update-desktop-database 2> /dev/null || : %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -# Workaround libiw detection failure on opensuse -%if 0%{?suse_version} -%__sed -i "wifi/ConfigureChecks.cmake" -e "s|^check_library_exists.*|set( HAVE_IW 1 )|" -%endif - # Update icons for some control center modules %__sed -i "filesharing/simple/fileshare.desktop" -e "s|^Icon=.*|Icon=kcmfileshare|" @@ -1174,6 +1182,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" |