summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2010-04-12 19:55:23 -0700
committerArwed von Merkatz2010-04-13 19:08:39 +0200
commitfa7cab7585aa6be2b2c244306f6f74d38099ee38 (patch)
tree01742384ced93085496cbe92eec5f1e14c5f7663
parentf4edc2c735a8b23c288b77d0646b92d25e6fe317 (diff)
koffice2: stable has ora CMakeList.txt in same location as unstable
-rw-r--r--kde4-apps/koffice2/HISTORY3
-rwxr-xr-xkde4-apps/koffice2/PRE_BUILD6
2 files changed, 4 insertions, 5 deletions
diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index 3e85d147a1..1bffd61807 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Eric Sandall <sandalle@sourcemage.org>
+ * PRE_BUILD: stable has ora CMakeList.txt in same location as unstable
+
2010-02-08 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: add optional create
diff --git a/kde4-apps/koffice2/PRE_BUILD b/kde4-apps/koffice2/PRE_BUILD
index 23b7f12b09..83ee8c5fd4 100755
--- a/kde4-apps/koffice2/PRE_BUILD
+++ b/kde4-apps/koffice2/PRE_BUILD
@@ -1,7 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-if [[ $KOFF_VER == unstable ]];then
- sed -i '/update_xdg_mimetypes/D' krita/plugins/formats/ora/CMakeLists.txt
-else
- sed -i '/update_xdg_mimetypes/D' filters/krita/ora/CMakeLists.txt
-fi
+sed -i '/update_xdg_mimetypes/D' krita/plugins/formats/ora/CMakeLists.txt