SPECS: openoffice.org.spec - use ooobasisdir macro - improved previous chan...

megabajt megabajt at pld-linux.org
Fri Apr 10 13:32:08 CEST 2009


Author: megabajt                     Date: Fri Apr 10 11:32:08 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use ooobasisdir macro
- improved previous changelog

---- Files affected:
SPECS:
   openoffice.org.spec (1.821 -> 1.822) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.821 SPECS/openoffice.org.spec:1.822
--- SPECS/openoffice.org.spec:1.821	Fri Apr 10 13:22:53 2009
+++ SPECS/openoffice.org.spec	Fri Apr 10 13:32:02 2009
@@ -2580,7 +2580,7 @@
 
 	%if %{with mozilla}
 	install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
-	ln -s %{_libdir}/%{name}/basis3.0/program/libnpsoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+	ln -s %{ooobasisdir}/program/libnpsoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
 	%endif
 
 	# FIXME: OOo doesn't start when sofficerc is a symlink:
@@ -2601,7 +2601,7 @@
 	perl -pi -e 's/^[       ]*LD_LIBRARY_PATH/# LD_LIBRARY_PATH/;s/export LD_LIBRARY_PATH/# export LD_LIBRARY_PATH/' \
 		$RPM_BUILD_ROOT%{ooobasisdir}/program/setup
 
-	chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/basis3.0/program/*.so
+	chmod +x $RPM_BUILD_ROOT%{ooobasisdir}/program/*.so
 
 	install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 	# put share to %{_datadir} so we're able to produce noarch packages
@@ -4343,6 +4343,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.822  2009/04/10 11:32:02  megabajt
+- use ooobasisdir macro
+- improved previous changelog
+
 Revision 1.821  2009/04/10 11:22:53  megabajt
 - added -ure, -i18n-by, -i18n-gd, -i18n-gu, -i18n-mn, i18n-my and i18n-oc
   subpackages
@@ -4352,6 +4356,7 @@
 - added --disable-access (didn't build without this flag)
 - %{_libdir}/%{name}/basis-link is back (OOo won't start without it)
 - packaged all remaining files
+- added -build.patch to fix build with recent ooo-build snap
 - I have built it --without-kde and seems to work on th-i686
 
 Revision 1.820  2009/04/10 10:39:02  glen
================================================================

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



More information about the pld-cvs-commit mailing list