Author: glen Date: Fri Mar 9 13:20:27 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- do not create symlink in %pre, maybe this way rpm won't nuke moved files
---- Files affected:
SPECS:
openoffice.org.spec (1.704.2.25 -> 1.704.2.26)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.25
SPECS/openoffice.org.spec:1.704.2.26
--- SPECS/openoffice.org.spec:1.704.2.25 Fri Mar 9 01:34:08 2007
+++ SPECS/openoffice.org.spec Fri Mar 9 14:20:22 2007
@@ -64,7 +64,7 @@
%endif
%define ver 2.1.0
-%define _rel 5
+%define _rel 5.1
%define subver 680
%define snap OOE680
%define snap2 SRC680
@@ -2418,13 +2418,11 @@
if [ -d %{_libdir}/%{name}/share ] && [ ! -L %{_libdir}/%{name}/share ]; then
install -d %{_datadir}/%{name}
mv %{_libdir}/%{name}/share %{_datadir}/%{name}/share || mv
%{_libdir}/%{name}/share{,.rpmsave}
- ln -snf %{_datadir}/%{name}/share %{_libdir}/%{name}/share
fi
%if %{with system_myspell}
# we symlink the dir, unless smb wishes to patch OOo to use system dir directly
if [ -d %{_libdir}/%{name}/share/dict/ooo ] && [ ! -L
%{_libdir}/%{name}/share/dict/ooo ]; then
rmdir %{_libdir}/%{name}/share/dict/ooo 2>/dev/null || mv -v
%{_libdir}/%{name}/share/dict/ooo{,.rpmsave} || :
- ln -s %{_datadir}/myspell %{_libdir}/%{name}/share/dict/ooo
fi
%endif
@@ -3813,6 +3811,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.704.2.26 2007/03/09 13:20:22 glen
+- do not create symlink in %pre, maybe this way rpm won't nuke moved files
+
Revision 1.704.2.25 2007/03/09 00:34:08 glen
- move %{name}/share to %{_datadir}, now external noarch packages possible
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.704.2.25&r2=1.704.2.26&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
