diff --git a/kdeedu.spec b/kdeedu.spec index 433d2e7..aebe024 100644 --- a/kdeedu.spec +++ b/kdeedu.spec @@ -47,6 +47,10 @@ Patch2: kdeedu-4.7.0-kmplot_cmake.patch ## upstreamable patches ## upstream patches +# fix build against gpsd-2.96+ +#https://bugs.kde.org/269165 +Patch100: marble-4.7.0-gpsd3.patch + Obsoletes: kdeedu4 < %{version}-%{release} Provides: kdeedu4 = %{version}-%{release} @@ -218,6 +222,9 @@ Group: System Environment/Libraries %patch1 -p1 -b .kalgebra_cmake %patch2 -p1 -b .kmplot_cmake +pushd marble-%{version} +%patch100 -p1 -b .gpsd3 +popd # create CMakeLists.txt with list of all subdirectories with kdeedu apps ls -d */ | sed 's/\(.*\)/add_subdirectory( \1 )/g' > CMakeLists.txt @@ -674,6 +681,7 @@ rm -rf %{buildroot} %changelog * Wed Aug 24 2011 Rex Dieter 4.7.0-2 - rebuild (gpsd) +- kdeedu-marble doesn't build with gpsd 2.96 (kde#269165) * Tue Jul 26 2011 Jaroslav Reznik 4.7.0-1 - 4.7.0