packages: kde4-kdewebdev/kde4-kdewebdev.spec - fix shadzhiit blind merge, d...

[glen]

Author: glen                         Date: Thu Feb 18 19:33:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix shadzhiit blind merge, diff -u/editdiff aren't that hard to use

---- Files affected:
packages/kde4-kdewebdev:
   kde4-kdewebdev.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: packages/kde4-kdewebdev/kde4-kdewebdev.spec
diff -u packages/kde4-kdewebdev/kde4-kdewebdev.spec:1.38 packages/kde4-kdewebdev/kde4-kdewebdev.spec:1.39
--- packages/kde4-kdewebdev/kde4-kdewebdev.spec:1.38	Thu Feb 18 17:46:26 2010
+++ packages/kde4-kdewebdev/kde4-kdewebdev.spec	Thu Feb 18 20:33:25 2010
@@ -299,10 +299,10 @@
 install -d build
 cd build
 %cmake \
+	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
 	-LIBTIDY_INCLUDE_DIR=%{_includedir} \
-	-DCMAKE_BUILD_TYPE=%{!?debug:release}%{?debug:debug} \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
@@ -469,6 +469,9 @@
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 $Log$
+Revision 1.39  2010/02/18 19:33:25  glen
+- fix shadzhiit blind merge, diff -u/editdiff aren't that hard to use
+
 Revision 1.38  2010/02/18 16:46:26  shadzik
 - merged from DEVEL
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdewebdev/kde4-kdewebdev.spec?r1=1.38&r2=1.39&f=u