rpms/kdeedu/devel kdeedu-4.0.80-step-buildfix.patch, NONE, 1.1 kdeedu.spec, 1.113, 1.114

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Thu Jun 5 10:37:59 UTC 2008


Author: kkofler

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

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-4.0.80-step-buildfix.patch 
Log Message:
* Thu Jun 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-4
- backport upstream fix for Step build

kdeedu-4.0.80-step-buildfix.patch:

--- NEW FILE kdeedu-4.0.80-step-buildfix.patch ---
Index: step/step/CMakeLists.txt
===================================================================
--- step/step/CMakeLists.txt	(revision 811220)
+++ step/step/CMakeLists.txt	(revision 811221)
@@ -47,6 +47,7 @@
     add_definitions(-DSTEP_WITH_QALCULATE)
     add_definitions(-DSTEP_WITH_UNITSCALC)
     add_definitions(${QALCULATE_CFLAGS})
+    add_definitions(${KDE4_ENABLE_EXCEPTIONS})
     set(qalculate_LIBS ${QALCULATE_LIBRARIES})
 endif(STEP_WITH_QALCULATE)
 


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- kdeedu.spec	3 Jun 2008 22:57:06 -0000	1.113
+++ kdeedu.spec	5 Jun 2008 10:37:14 -0000	1.114
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications 
 Version: 4.0.80
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -24,6 +24,8 @@
 Patch0:  kdeedu-4.0.4-cfitsio.patch
 # get this to build against OpenBabel 2.2.0 beta4
 Patch1:  kdeedu-4.0.80-openbabel.patch
+# fix Step build: http://websvn.kde.org/?view=rev&revision=811221
+Patch100: kdeedu-4.0.80-step-buildfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://bugzilla.redhat.com/371121
@@ -129,6 +131,7 @@
 %setup -q -n kdeedu-%{version}
 %patch0 -p1 -b .cfitsio
 %patch1 -p1 -b .openbabel
+%patch100 -p0 -b .step-buildfix
 
 
 %build
@@ -222,6 +225,9 @@
 
 
 %changelog
+* Thu Jun 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-4
+- backport upstream fix for Step build
+
 * Tue Jun 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-3
 - add BR gmm-devel, libqalculate-devel and gsl-devel for Step
 




More information about the fedora-extras-commits mailing list