rpms/openoffice.org/devel openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch, NONE, 1.1 openoffice.org.spec, 1.1374, 1.1375

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch 
Log Message:
fix up devel

openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch:

--- NEW FILE openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch ---
diff -ru openoffice.org/solenv/bin/compiler.wrap openoffice.org/solenv/bin/compiler.wrap
--- openoffice.org.orig/solenv/bin/compiler.wrap	2008-01-10 12:24:02.000000000 +0000
+++ openoffice.org/solenv/bin/compiler.wrap	2008-01-10 12:26:52.000000000 +0000
@@ -1,4 +1,3 @@
-#!/usr/solar/bin/perl -w
 #!/usr/bin/perl
 
 #print STDERR "ARGV =\n at ARGV\n";
diff -ru openoffice.org/solenv/bin/langwrap openoffice.org/solenv/bin/langwrap
--- openoffice.org.orig/solenv/bin/langwrap	2008-01-10 12:24:02.000000000 +0000
+++ openoffice.org/solenv/bin/langwrap	2008-01-10 12:26:45.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/solar/bin/perl -w
+#!/usr/bin/perl -w
 #
 # langwrap - language wrapper for building resources
 #
diff -ru openoffice.org/solenv/bin/modules/osarch.pm openoffice.org/solenv/bin/modules/osarch.pm
--- openoffice.org.orig/solenv/bin/modules/osarch.pm	2008-01-10 12:24:02.000000000 +0000
+++ openoffice.org/solenv/bin/modules/osarch.pm	2008-01-10 12:26:56.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/solar/bin/perl -w
+#!/usr/bin/perl -w
 
 # ***********************************************************************
 # Description: 
diff -ru openoffice.org/solenv/bin/pchdelta.py openoffice.org/solenv/bin/pchdelta.py
--- openoffice.org.orig/solenv/bin/pchdelta.py	2008-01-10 12:24:02.000000000 +0000
+++ openoffice.org/solenv/bin/pchdelta.py	2008-01-10 12:27:28.000000000 +0000
@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/python
 
 # ------------------------------------------------------------------------------
 # Hacky little delta debug tool to figure out the proper includes for a pch file


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1374
retrieving revision 1.1375
diff -u -r1.1374 -r1.1375
--- openoffice.org.spec	10 Jan 2008 07:35:27 -0000	1.1374
+++ openoffice.org.spec	10 Jan 2008 17:52:27 -0000	1.1375
@@ -1,6 +1,6 @@
 %define oootag OOH680
 %define ooomilestone 1
-%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
@@ -136,6 +136,7 @@
 Patch62: openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
 Patch63: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch
 Patch64: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch65: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -317,7 +318,7 @@
 Summary: Development Libraries for %{name}
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: sdk
+Requires: %{name}-sdk = %{epoch}:%{version}-%{release}
 
 %description devel
 The %{name} devel package provides necessary headers for development against %{name}.
@@ -1086,6 +1087,7 @@
 %patch62 -p1 -b .oo85055.psprint.linetoolong.patch
 %patch63 -p1 -b .oooXXXXX.config_office.xpcomasxul.patch
 %patch64 -p1 -b .ooo85097.desktop.pagein.patch
+%patch65 -p1 -b .oooXXXXX.solenv.paths.patch
 
 # temporary until hsqldb is updated in rawhide
 sed -i -e "s/exit 1/exit 0/g" config_office/configure.in
@@ -1219,6 +1221,15 @@
 dmake sdkoo
 cd ../../
 
+#add enough to the sdk to build the kde vcl plug out of tree
+cp -r solenv/ $RPM_BUILD_ROOT/%{instdir}/sdk
+cp solver/680/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{instdir}/sdk/linux/bin
+cp -r solver/680/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/680/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/680/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/680/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/680/unxlng*/inc/vos $RPM_BUILD_ROOT/%{instdir}/sdk/include
+
 #configure sdk
 pushd $RPM_BUILD_ROOT/%{instdir}/sdk
     for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
@@ -1236,17 +1247,51 @@
             $file.in > $file
         chmod 755 $file
     done
+#remove CVS dirs
+    find . -name CVS -type d -exec rm -rf {} \;
+#remove any .patch files
+    find . -name "*.patch" -exec rm -f {} \;
+#relocate dmake
+    mv solenv/unxlng*.pro/bin/dmake solenv/bin
+    rm -rf solenv/unxlng*.pro
+#fix up checkdll
+    sed -r "s#^checkdll=.*#checkdll=\"%{instdir}/sdk/linux/bin/checkdll\"#g" solenv/bin/checkdll.sh
+#make env
+    echo export PATH=\$PATH:%{instdir}/sdk/solenv/bin > setdevelenv_unix.sh
+    echo export DMAKEROOT=%{instdir}/sdk/solenv/inc/startup >> setdevelenv_unix.sh
+    echo export OS="LINUX" >> setdevelenv_unix.sh
+    echo export SOLARENV=%{instdir}/sdk/solenv >> setdevelenv_unix.sh
+    echo export SOLARVER="`pwd`/solver/680" >> setdevelenv_unix.sh
+    echo export SOLARVERSION="\$SOLARVER" >> setdevelenv_unix.sh
+    echo export INPATH="$INPATH" >> setdevelenv_unix.sh
+    echo export OUTPATH="$OUTPATH" >> setdevelenv_unix.sh
+    echo export UPD="$UPD" >> setdevelenv_unix.sh 
+    echo export UPDATER="YES" >> setdevelenv_unix.sh
+    echo export WORK_STAMP="$WORK_STAMP" >> setdevelenv_unix.sh
+    echo export GUI="UNX" >> setdevelenv_unix.sh
+    echo export GUIBASE="unx" >> setdevelenv_unix.sh
+    echo export PATH_SEPERATOR=":" >> setdevelenv_unix.sh
+    echo export COM="GCC" >> setdevelenv_unix.sh
+    echo export GLIBC="2REDHAT60" >> setdevelenv_unix.sh
+    echo export OS="LINUX" >> setdevelenv_unix.sh
+    echo export SHELL="/bin/bash" >> setdevelenv_unix.sh
+    echo export USE_SHELL="bash" >> setdevelenv_unix.sh
+    echo export CVER="$CVER" >> setdevelenv_unix.sh
+    echo export CPU="$CPU" >> setdevelenv_unix.sh
+    echo export MAKEDEPEND=makedepend >> setdevelenv_unix.sh
+    echo export MKOUT="mkout.pl" >> setdevelenv_unix.sh
+    echo export SOLARINC=\"-I%{instdir}/sdk/include/stl -I%{instdir}/sdk/include\" >> setdevelenv_unix.sh
+    echo export SOLARLIB=\"-L%{instdir}/program\" >> setdevelenv_unix.sh
+    echo export GXX_INCLUDE_PATH="$GXX_INCLUDE_PATH" >> setdevelenv_unix.sh
+    echo export EXTERNAL_WARNINGS_NOT_ERRORS="TRUE" >> setdevelenv_unix.sh
+    echo export GVER="VCL" >> setdevelenv_unix.sh
+    echo export PRODUCT="full" >> setdevelenv_unix.sh
+    echo export ISOLANG_MAJOR=1 >> setdevelenv_unix.sh
+    echo export COMPHLP_MAJOR=4 >> setdevelenv_unix.sh
+    echo export UCBHELPER_MAJOR=4 >> setdevelenv_unix.sh
+    echo export VOS_MAJOR=3 >> setdevelenv_unix.sh
 popd
 
-#add enough to the sdk to build the kde vcl plug out of tree
-cp -r solenv/ $RPM_BUILD_ROOT/%{instdir}/sdk
-cp solver/680/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{instdir}/sdk/linux/bin
-cp -r solver/680/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/vos $RPM_BUILD_ROOT/%{instdir}/sdk/include
-
 #add our custom configuration options
 #default GTK fpicker
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH1}
@@ -2757,6 +2802,7 @@
 %files sdk
 %defattr(-,root,root,-)
 %{instdir}/sdk/
+%exclude %{instdir}/sdk/setdevelenv_unix.sh
 %exclude %{instdir}/sdk/docs/
 %exclude %{instdir}/sdk/examples/
 %exclude %{instdir}/sdk/include/tools
@@ -2774,6 +2820,7 @@
 
 %files devel
 %defattr(-,root,root,-)
+%{instdir}/sdk/setdevelenv_unix.sh
 %{instdir}/sdk/include/tools
 %{instdir}/sdk/include/comphelper
 %{instdir}/sdk/include/i18npool
@@ -2815,6 +2862,9 @@
 
 
 %changelog
+* Thu Jan 10 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-1.2
+- add openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch to fix up -devel Requires
+
 * Sat Jan 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-1.1
 - first OOH680_m1
 - remove redundant entries from configure