SPECS (DEVEL): openoffice.org.spec - unorc has to exists in progra...

[arekm]

Author: arekm                        Date: Mon Mar 10 20:21:53 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- unorc has to exists in program/unorc not /etc (otherwise paths break unfortunately)

---- Files affected:
SPECS:
   openoffice.org.spec (1.775.2.61 -> 1.775.2.62) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.775.2.61 SPECS/openoffice.org.spec:1.775.2.62
--- SPECS/openoffice.org.spec:1.775.2.61	Mon Mar 10 21:18:45 2008
+++ SPECS/openoffice.org.spec	Mon Mar 10 21:21:47 2008
@@ -2433,8 +2433,13 @@
 	install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 	mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/program,%{_sysconfdir}/%{name}}/sofficerc
 	ln -s %{_sysconfdir}/%{name}/sofficerc $RPM_BUILD_ROOT%{_libdir}/%{name}/program
-	mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/program,%{_sysconfdir}/%{name}}/unorc
-	ln -s %{_sysconfdir}/%{name}/unorc $RPM_BUILD_ROOT%{_libdir}/%{name}/program
+
+	# This breaks apps: The application cannot be started. The component manager is not available.
+	# Probably due to relative paths in unorc.
+	# mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/program,%{_sysconfdir}/%{name}}/unorc
+	# ln -s %{_sysconfdir}/%{name}/unorc $RPM_BUILD_ROOT%{_libdir}/%{name}/program
+	# Use this instead:
+	ln -s %{_libdir}/%{name}/program/unorc $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/unorc
 
 	perl -pi -e 's/^[       ]*LD_LIBRARY_PATH/# LD_LIBRARY_PATH/;s/export LD_LIBRARY_PATH/# export LD_LIBRARY_PATH/' \
 		$RPM_BUILD_ROOT%{_libdir}/%{name}/program/setup
@@ -2727,8 +2732,11 @@
 
 
 %dir %{_sysconfdir}/%{name}
+%{_libdir}/%{name}/program/sofficerc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/sofficerc
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/unorc
+
+%{_sysconfdir}/%{name}/unorc
+%config(noreplace) %verify(not md5 mtime size) %{_libdir}/%{name}/program/unorc
 
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/program
@@ -2738,7 +2746,6 @@
 %{_libdir}/%{name}/program/*.rdb
 %{_libdir}/%{name}/program/*.bmp
 %{_libdir}/%{name}/program/sofficerc
-%{_libdir}/%{name}/program/unorc
 %{_libdir}/%{name}/program/bootstraprc
 %{_libdir}/%{name}/program/configmgrrc
 
@@ -4150,6 +4157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.775.2.62  2008-03-10 20:21:47  arekm
+- unorc has to exists in program/unorc not /etc (otherwise paths break unfortunately)
+
 Revision 1.775.2.61  2008-03-10 20:18:45  arekm
 - enable more stuff
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org.spec?r1=1.775.2.61&r2=1.775.2.62&f=u