Author: arekm Date: Fri Jul 30 20:46:45 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- partial 4.5.0 update (needs full test build)
---- Files affected:
packages/kde4-kdeedu:
kde4-kdeedu-R.patch (1.1 -> 1.2) , kde4-kdeedu.spec (1.66 -> 1.67) ,
kde4-kdeedu-python.patch (1.1 -> NONE) (REMOVED)
---- 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.2
--- packages/kde4-kdeedu/kde4-kdeedu-R.patch:1.1 Mon Feb 1 12:39:22 2010
+++ packages/kde4-kdeedu/kde4-kdeedu-R.patch Fri Jul 30 22:46:40 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~ 2010-06-08 12:10:20.000000000 +0200
++++ cmake/modules/FindR.cmake 2010-07-30 22:26:30.990748100 +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)
================================================================
Index: packages/kde4-kdeedu/kde4-kdeedu.spec
diff -u packages/kde4-kdeedu/kde4-kdeedu.spec:1.66
packages/kde4-kdeedu/kde4-kdeedu.spec:1.67
--- packages/kde4-kdeedu/kde4-kdeedu.spec:1.66 Fri Jul 9 10:04:25 2010
+++ packages/kde4-kdeedu/kde4-kdeedu.spec Fri Jul 30 22:46:40 2010
@@ -7,17 +7,16 @@
Summary: K Desktop Environment - edutainment
Summary(pl.UTF-8): K Desktop Environment - edukacja i rozrywka
Name: kde4-kdeedu
-Version: 4.4.5
-Release: 6
+Version: 4.5.0
+Release: 1
License: GPL
Group: X11/Applications/Games
Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 9f6849939e47266650567778470d73c8
+# Source0-md5: 19be97c43c4be547f638d4c34c19d449
Patch0: %{name}-findindi.patch
Patch1: %{name}-R.patch
Patch2: %{name}-categories.patch
Patch3: %{name}-libcln.patch
-Patch4: %{name}-python.patch
BuildRequires: Qt3Support-devel >= %{qtver}
BuildRequires: QtDesigner-devel >= %{qtver}
BuildRequires: QtOpenGL-devel >= %{qtver}
@@ -507,7 +506,6 @@
%patch1 -p0
%patch2 -p0
%patch3 -p0
-%patch4 -p1
%build
install -d build
@@ -999,6 +997,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.67 2010/07/30 20:46:40 arekm
+- partial 4.5.0 update (needs full test build)
+
Revision 1.66 2010/07/09 08:04:25 arekm
- release 6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeedu/kde4-kdeedu-R.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeedu/kde4-kdeedu.spec?r1=1.66&r2=1.67&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
