[kdesdk] use simpler -DBUILD_umbrello cmake option instead of patching

Rex Dieter rdieter at fedoraproject.org
Sun Jul 31 16:54:16 UTC 2011


commit b895765b6a427b5d28899b3dcdfd19c8905651dc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Jul 31 11:59:28 2011 -0500

    use simpler -DBUILD_umbrello cmake option instead of patching

 kdesdk-4.7.0-no_umbrello.patch |   16 ----------------
 kdesdk.spec                    |    9 +++------
 2 files changed, 3 insertions(+), 22 deletions(-)
---
diff --git a/kdesdk.spec b/kdesdk.spec
index 7227a95..64b65dc 100644
--- a/kdesdk.spec
+++ b/kdesdk.spec
@@ -9,7 +9,6 @@ Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{versio
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # HACK to omit FTBFS umbrello for now
-Patch1: kdesdk-4.7.0-no_umbrello.patch 
 # test against _qt48 macro when available -- rex
 %if 0%{?fedora} < 16
 %define umbrello 1
@@ -253,15 +252,13 @@ Requires: %{name}-common = %{version}-%{release}
 %prep
 %setup -q -n kdesdk-%{version}
 
-%if ! 0%{?umbrello} 
-%patch1 -p1 -b .no_umbrello
-%endif
-
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} \
+  %{!?umbrello: -DBUILD_umbrello:BOOL=OFF} \
+  ..
 popd
 
 make -C %{_target_platform}/doc


More information about the scm-commits mailing list