[koffice] revert http://websvn.kde.org/?view=revision&revision=1179981 an incompatible change, breaks <= kde-4

Rex Dieter rdieter at fedoraproject.org
Sat Oct 2 20:14:32 UTC 2010


commit ff486b02abd3ea4c1a9651591b1add6256cfa41c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 2 15:19:25 2010 -0500

    revert http://websvn.kde.org/?view=revision&revision=1179981
    an incompatible change, breaks <= kde-4.5.x

 koffice-2.2.82-OKULAR_FOUND.patch |   18 ++++++++++++++++++
 koffice.spec                      |    5 +++++
 2 files changed, 23 insertions(+), 0 deletions(-)
---
diff --git a/koffice-2.2.82-OKULAR_FOUND.patch b/koffice-2.2.82-OKULAR_FOUND.patch
new file mode 100644
index 0000000..98e51df
--- /dev/null
+++ b/koffice-2.2.82-OKULAR_FOUND.patch
@@ -0,0 +1,18 @@
+diff -up koffice-2.2.82/tools/CMakeLists.txt.OKULAR_FOUND koffice-2.2.82/tools/CMakeLists.txt
+--- koffice-2.2.82/tools/CMakeLists.txt.OKULAR_FOUND	2010-10-02 14:51:26.282746102 -0500
++++ koffice-2.2.82/tools/CMakeLists.txt	2010-10-02 14:35:39.049485176 -0500
+@@ -6,11 +6,11 @@ macro_optional_add_subdirectory( slideco
+ 
+ macro_optional_find_package(Okular)
+ 
+-if(Okular_FOUND)
++if(OKULAR_FOUND)
+     add_subdirectory( okularodpgenerator )
+-else(Okular_FOUND)
++else(OKULAR_FOUND)
+     message(STATUS "Did NOT find Okular libraries, Okular generator will not be build")
+-endif(Okular_FOUND)
++endif(OKULAR_FOUND)
+ 
+ macro_optional_find_package(X11)
+ macro_optional_find_package(Qt4)
diff --git a/koffice.spec b/koffice.spec
index c34d641..4317ea8 100644
--- a/koffice.spec
+++ b/koffice.spec
@@ -32,6 +32,9 @@ Source0:        http://download.kde.org/stable/koffice-%{version}/koffice-%{vers
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
+# revert http://websvn.kde.org/?view=revision&revision=1179981
+# an incompatible change, breaks <= kde-4.5.x
+Patch50: koffice-2.2.82-OKULAR_FOUND.patch
 
 ## upstream patches
 
@@ -492,6 +495,8 @@ Requires:       libxml2-devel
 %prep
 %setup -q
 
+%patch50 -p1 -b .OKULAR_FOUND
+
 ## kdchart munging begin
 pushd plugins/chartshape/kdchart
 mv src kdchart


More information about the scm-commits mailing list