[kdebase-workspace/f15] adapt nm-09-compat patch
Than Ngo
than at fedoraproject.org
Tue Jun 7 11:04:48 UTC 2011
commit 84d3576946d6a4676e6d27f2f473c504376e8a57
Author: Than Ngo <than at redhat.com>
Date: Tue Jun 7 13:04:21 2011 +0200
adapt nm-09-compat patch
...h => kdebase-workspace-4.6.4-nm-09-compat.patch | 2 +-
kdebase-workspace.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/kdebase-workspace-4.6.3-nm-09-compat.patch b/kdebase-workspace-4.6.4-nm-09-compat.patch
similarity index 99%
rename from kdebase-workspace-4.6.3-nm-09-compat.patch
rename to kdebase-workspace-4.6.4-nm-09-compat.patch
index 6f516e3..fa205a4 100644
--- a/kdebase-workspace-4.6.3-nm-09-compat.patch
+++ b/kdebase-workspace-4.6.4-nm-09-compat.patch
@@ -5,7 +5,7 @@ diff -ur kdebase-workspace-4.6.3/solid/CMakeLists.txt kdebase-workspace-4.6.3-nm
add_subdirectory(networkmanager-0.6)
endif (NM_0_6)
-- macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.9.0" NM_0_7)
+- macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.8.10" NM_0_7)
+ macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7)
if (NM_0_7)
message(STATUS "Will build networkmanager-0.7")
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index c60bec5..359b6a4 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -75,7 +75,7 @@ Patch50: kdebase-workspace-4.3.3-kde#171685.patch
Patch200: kdebase-workspace-4.5.85-no_HAL.patch
Patch210: kdebase-workspace-4.5.90-no_HAL2.patch
## other
-Patch220: kdebase-workspace-4.6.3-nm-09-compat.patch
+Patch220: kdebase-workspace-4.6.4-nm-09-compat.patch
# fix kde#270942 (direct rendering disabled on Intel graphics since mesa 7.10.1)
Patch300: kdebase-workspace-4.6.2-kwin-opengltest-kde#270942.patch
More information about the scm-commits
mailing list