rpms/kdeedu/devel kdeedu-4.0.4-cfitsio.patch, NONE, 1.1 .cvsignore, 1.42, 1.43 kdeedu.spec, 1.100, 1.101 sources, 1.46, 1.47 kdeedu-4.0.2-cfitsio.patch, 1.2, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4985/devel

Modified Files:
	.cvsignore kdeedu.spec sources 
Added Files:
	kdeedu-4.0.4-cfitsio.patch 
Removed Files:
	kdeedu-4.0.2-cfitsio.patch 
Log Message:
* Wed May 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-1
- update to 4.0.72
- use pkgconfig for cfitsio patch now that cfitsio.pc has been fixed
- BR kdebase-workspace-devel for plasmoids

kdeedu-4.0.4-cfitsio.patch:

--- NEW FILE kdeedu-4.0.4-cfitsio.patch ---
diff -up kdeedu-4.0.4/cmake/modules/FindCFitsio.cmake.cfitsio kdeedu-4.0.4/cmake/modules/FindCFitsio.cmake
--- kdeedu-4.0.4/cmake/modules/FindCFitsio.cmake.cfitsio	2008-01-04 17:56:03.000000000 -0600
+++ kdeedu-4.0.4/cmake/modules/FindCFitsio.cmake	2008-05-07 14:36:53.000000000 -0500
@@ -20,13 +20,22 @@ if (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBR
 
 else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
 
+  IF (NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    INCLUDE(UsePkgConfig)
+    PKGCONFIG(cfitsio _CFitsioIncDir _CFitsioLinkDir _CFitsioLinkFlags _CFitsioCflags)
+  ENDIF (NOT WIN32)
+
   find_path(CFITSIO_INCLUDE_DIR fitsio.h
+    ${_CFitsioIncDir} 
     ${_obIncDir}
     ${GNUWIN32_DIR}/include
   )
 
   find_library(CFITSIO_LIBRARIES NAMES cfitsio
     PATHS
+    ${_CFitsioLinkDir}
     ${_obLinkDir}
     ${GNUWIN32_DIR}/lib
   )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	28 Mar 2008 17:36:40 -0000	1.42
+++ .cvsignore	7 May 2008 23:18:42 -0000	1.43
@@ -1,4 +1 @@
-kdeedu-4.0.0.tar.bz2
-kdeedu-4.0.1.tar.bz2
-kdeedu-4.0.2.tar.bz2
-kdeedu-4.0.3.tar.bz2
+kdeedu-4.0.72.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kdeedu.spec	23 Apr 2008 16:51:13 -0000	1.100
+++ kdeedu.spec	7 May 2008 23:18:42 -0000	1.101
@@ -13,16 +13,15 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications 
-Version: 4.0.3
-Release: 4%{?dist}
+Version: 4.0.72
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
-# fix cfitsio detection by adding another hardcoded directory
-# (cfitsio.pc is broken in the Fedora cfitsio package, #436539)
-Patch1:  kdeedu-4.0.2-cfitsio.patch
+# fix cfitsio detection by using pkgconfig
+Patch0:  kdeedu-4.0.4-cfitsio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://bugzilla.redhat.com/371121
@@ -45,6 +44,8 @@
 BuildRequires: eigen-devel
 BuildRequires: giflib-devel
 BuildRequires: gpsd-devel
+# for libplasma
+BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: kdelibs4-devel >= %{version}
 # for macros.kde4
 BuildRequires: kde-filesystem
@@ -60,6 +61,8 @@
 BuildRequires: readline-devel
 ## BR's FIXME/TODO:
 #+ libsbigudrv, 1.00: SBIG Universal Driver is needed by KStars <http://indi.sourceforge.net/>
+#+ Gmm++, 3.0: A generic C++ template library for sparse, dense and skyline matrices is required to build Step <http://home.gna.org/getfem/>
+#  Step also needs libqalculate-devel and gsl-devel which are already packaged.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -109,7 +112,7 @@
 
 %prep
 %setup -q -n kdeedu-%{version}
-%patch1 -p1 -b .cfitsio
+%patch0 -p1 -b .cfitsio
 
 
 %build
@@ -177,6 +180,11 @@
 
 
 %changelog
+* Wed May 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-1
+- update to 4.0.72
+- use pkgconfig for cfitsio patch now that cfitsio.pc has been fixed
+- BR kdebase-workspace-devel for plasmoids
+
 * Wed Apr 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-4
 - rebuild for new ocaml (3.10.2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	28 Mar 2008 17:36:40 -0000	1.46
+++ sources	7 May 2008 23:18:42 -0000	1.47
@@ -1 +1 @@
-01c9bb9c13bda190fcab94b15751f0a8  kdeedu-4.0.3.tar.bz2
+36c4f6b654e2a50db2d90a06da143c4f  kdeedu-4.0.72.tar.bz2


--- kdeedu-4.0.2-cfitsio.patch DELETED ---