rpms/openoffice.org/devel openoffice.org.spec,1.1526,1.1527

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu Jun 5 07:31:57 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15306

Modified Files:
	openoffice.org.spec 
Log Message:
I hate the sdk


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1526
retrieving revision 1.1527
diff -u -r1.1526 -r1.1527
--- openoffice.org.spec	4 Jun 2008 09:58:11 -0000	1.1526
+++ openoffice.org.spec	5 Jun 2008 07:31:08 -0000	1.1527
@@ -1,6 +1,6 @@
 %define oootag DEV300
 %define ooomilestone 16
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -1487,6 +1487,17 @@
 cp -r solver/%{OFFICEUPD}/unxlng*/inc/vos $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
 
 #configure sdk
+pushd $RPM_BUILD_ROOT/%{baseinstdir}/sdk/linux/lib
+ln -s ../../../ure/lib/libuno_cppu.so.3 libuno_cppu.so
+ln -s ../../../ure/lib/libuno_cppuhelpergcc3.so.3 libuno_cppuhelpergcc3.so
+ln -s ../../../ure/lib/libuno_sal.so.3 libuno_sal.so
+ln -s ../../../ure/lib/libuno_salhelpergcc3.so.3 libuno_salhelpergcc3.so
+
+if [ -r ../../../ure/lib/libstlport_gcc.so ]; then
+   ln -s ../../../ure/lib/libstlport_gcc.so libstlport_gcc.so
+fi
+popd
+
 pushd $RPM_BUILD_ROOT/%{baseinstdir}/sdk
     find . -name "*.orig" -exec rm {} \;
     for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
@@ -3427,6 +3438,9 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
+* Thu Jun 05 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.16-2
+- still fighting the sdk
+
 * Wed Jun 04 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.16-1
 - next version
 - add openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch




More information about the fedora-extras-commits mailing list