diff options
| author | Francois Andriot <[email protected]> | 2013-01-07 22:01:14 +0100 |
|---|---|---|
| committer | Francois Andriot <[email protected]> | 2013-01-07 22:01:14 +0100 |
| commit | 0b6cf1d91af0dc06ac1aedf6d6eba438c18c7e8f (patch) | |
| tree | 70b7ca5229f712fd733cbe023e7f1347e432261f | |
| parent | 32c6bd4f88baa67c89d8c55cacf79d6a4819c2da (diff) | |
| download | tde-packaging-0b6cf1d91af0dc06ac1aedf6d6eba438c18c7e8f.tar.gz tde-packaging-0b6cf1d91af0dc06ac1aedf6d6eba438c18c7e8f.zip | |
RPM packaging: adds forgotten files for kdenetwork
| -rw-r--r-- | redhat/kdenetwork/kdenetwork-3.5.13.1-add_cmake_macro.patch | 24 | ||||
| -rw-r--r-- | redhat/kdenetwork/kdenetwork-3.5.13.1-wifi3.diff | 14 | ||||
| -rw-r--r-- | redhat/kdenetwork/trinity-kdenetwork-3.5.13.1.spec | 4 |
3 files changed, 40 insertions, 2 deletions
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13.1-add_cmake_macro.patch b/redhat/kdenetwork/kdenetwork-3.5.13.1-add_cmake_macro.patch new file mode 100644 index 000000000..e97a4ec27 --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.5.13.1-add_cmake_macro.patch @@ -0,0 +1,24 @@ +From caedf8323c45b376c824de343f31de78664b2511 Mon Sep 17 00:00:00 2001 +From: Serghei Amelian <[email protected]> +Date: Sun, 12 Feb 2012 21:08:53 +0000 +Subject: [TDEMacros.cmake] added tde_save_and_set() macro + +--- +diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake +index 075b7eb..1091755 100644 +--- a/modules/TDEMacros.cmake ++++ b/modules/TDEMacros.cmake +@@ -1283,6 +1283,11 @@ macro( tde_save ) + endforeach() + endmacro() + ++macro( tde_save_and_set _var ) ++ set( __bak_${_var} ${${_var}} ) ++ set( ${_var} ${ARGN} ) ++endmacro( ) ++ + macro( tde_restore ) + foreach( _var ${ARGN} ) + set( ${_var} ${__bak_${_var}} ) +-- +cgit v0.9.0.2-39-g756e diff --git a/redhat/kdenetwork/kdenetwork-3.5.13.1-wifi3.diff b/redhat/kdenetwork/kdenetwork-3.5.13.1-wifi3.diff new file mode 100644 index 000000000..b9540655f --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.5.13.1-wifi3.diff @@ -0,0 +1,14 @@ +diff --git a/wifi/ConfigureChecks.cmake b/wifi/ConfigureChecks.cmake +index f3a7ddb..86ca98b 100644 +--- a/wifi/ConfigureChecks.cmake ++++ b/wifi/ConfigureChecks.cmake +@@ -21,7 +21,9 @@ endif( ) + + + # check for wireless tools ++tde_save_and_set( CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-lm" ) + check_library_exists( iw iw_get_stats "" HAVE_IW ) ++tde_restore( CMAKE_REQUIRED_FLAGS ) + if( HAVE_IW ) + check_include_file( iwlib.h HAVE_IWLIB_H ) + # we need at least wireless tools >= 27 diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.1.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.1.spec index 17289dd76..ee0f0bc2e 100644 --- a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.1.spec +++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.1.spec @@ -63,8 +63,8 @@ Patch1: kdenetwork-3.5.13-missing_ldflags.patch # [kdenetwork] FTBFS in SMS client [Bug #1241] Patch2: kdenetwork-3.5.13.1-fix_smsclient_ftbfs.patch # [kdenetwork] Fix iwlib support in openSUSE -Patch7: caedf8323c45b376c824de343f31de78664b2511.patch -Patch8: kdenetwork-wifi3.diff +Patch7: kdenetwork-3.5.13.1-add_cmake_macro.patch +Patch8: kdenetwork-3.5.13.1-wifi3.diff # RHEL4 specific Patch201: kdenetwork-3.5.13.1-fix_rhel4_libraries.patch |