SPECS (DEVEL): openoffice.org.spec - delete line, not replace empty
glen
glen at pld-linux.org
Sun Jan 27 16:51:53 CET 2008
Author: glen Date: Sun Jan 27 15:51:53 2008 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- delete line, not replace empty
---- Files affected:
SPECS:
openoffice.org.spec (1.775.2.27 -> 1.775.2.28)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.775.2.27 SPECS/openoffice.org.spec:1.775.2.28
--- SPECS/openoffice.org.spec:1.775.2.27 Sun Jan 27 15:20:39 2008
+++ SPECS/openoffice.org.spec Sun Jan 27 16:51:48 2008
@@ -2110,11 +2110,10 @@
# TODO: use patches/hotfixes dir from now on
echo "[ PLDOnly ]" >> patches/src680/apply
-#remove patch (temporary FIX)
-%{__sed} -i "s,oox-stlportism-fix.diff,,g" patches/src680/apply
-%{__sed} -i "s,system-stlport51-oox.diff,,g" patches/src680/apply
-%{__sed} -i "s,system-stlport51-oox-map.diff,,g" patches/src680/apply
-
+# remove patches (temporary FIX)
+%{__sed} -i -e "/oox-stlportism-fix.diff/" patches/src680/apply
+%{__sed} -i -e "/system-stlport51-oox.diff/" patches/src680/apply
+%{__sed} -i -e "/system-stlport51-oox-map.diff/" patches/src680/apply
# patches applied by ooo (extension .diff is required)
for P in \
@@ -4112,6 +4111,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.775.2.28 2008-01-27 15:51:48 glen
+- delete line, not replace empty
+
Revision 1.775.2.27 2008-01-27 14:20:39 blekot
- added support for CCACHE_DIR to pass into build when ccache bcond is used
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org.spec?r1=1.775.2.27&r2=1.775.2.28&f=u
More information about the pld-cvs-commit
mailing list