Author: shadzik Date: Fri May 28 19:08:35 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- up for 4.5
---- Files affected:
packages/kde4-kdeedu:
kde4-kdeedu-R.patch (1.1 -> 1.1.2.1)
---- Diffs:
================================================================
Index: packages/kde4-kdeedu/kde4-kdeedu-R.patch
diff -u packages/kde4-kdeedu/kde4-kdeedu-R.patch:1.1
packages/kde4-kdeedu/kde4-kdeedu-R.patch:1.1.2.1
--- packages/kde4-kdeedu/kde4-kdeedu-R.patch:1.1 Mon Feb 1 12:39:22 2010
+++ packages/kde4-kdeedu/kde4-kdeedu-R.patch Fri May 28 21:08:29 2010
@@ -1,11 +1,11 @@
---- cmake/modules/FindR.cmake.orig 2010-02-01 12:35:52.434303194 +0100
-+++ cmake/modules/FindR.cmake 2010-02-01 12:36:39.665039919 +0100
-@@ -57,7 +57,7 @@
+--- cmake/modules/FindR.cmake.orig 2010-05-05 11:39:33.000000000 +0200
++++ cmake/modules/FindR.cmake 2010-05-28 21:06:46.899757356 +0200
+@@ -46,7 +46,7 @@
- FIND_LIBRARY(LIBR_SO
- R
-- PATHS ${R_HOME}/lib ${R_SHAREDLIBDIR} ${R_HOME}/bin
-+ PATHS /usr/lib /usr/lib64 ${R_HOME}/lib ${R_SHAREDLIBDIR} ${R_HOME}/bin
- NO_DEFAULT_PATH)
- IF(NOT LIBR_SO)
- MESSAGE(STATUS "libR not found. Make sure the location of R was
detected correctly, above, and R was compiled with the --enable-shlib option")
+ FIND_LIBRARY(R_R_LIBRARY
+ R
+- HINTS ${R_HOME}/lib ${R_SHARED_LIB_DIR} ${R_HOME}/bin )
++ HINTS /usr/lib /usr/lib64 ${R_HOME}/lib ${R_SHARED_LIB_DIR} ${R_HOME}/bin
)
+ IF(NOT R_R_LIBRARY)
+ MESSAGE(STATUS "libR not found. Make sure the location of R was detected
correctly, above, and R was compiled with the --enable-shlib option")
+ ELSE(NOT R_R_LIBRARY)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeedu/kde4-kdeedu-R.patch?r1=1.1&r2=1.1.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
