rpms/openoffice.org/devel openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.20, 1.21 openoffice.org.spec, 1.1251, 1.1252

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
	openoffice.org.spec 
Log Message:
try and debug what the fuck is going on here

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	16 Aug 2007 07:04:22 -0000	1.20
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	17 Aug 2007 17:57:33 -0000	1.21
@@ -849,3 +849,19 @@
  
  #if OSL_DEBUG_LEVEL > 1
      fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
+Index: ./bin/modules/installer/worker.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/worker.pm,v
+retrieving revision 1.51
+diff -u -r1.51 worker.pm
+--- openoffice.org.orig/solenv/bin/modules/installer/worker.pm	31 Jul 2007 13:59:14 -0000	1.51
++++ openoffice.org/solenv/bin/modules/installer/worker.pm	17 Aug 2007 17:55:11 -0000
+@@ -791,7 +791,7 @@
+ 
+ 		push @lines, "$destination\n";
+ 		# printf "cp $sourcepath $destdir$destination\n";
+-		copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $!";
++		copy ("$sourcepath", "$destdir$destination") || die "Can't copy file $sourcepath to $destdir$destination: $!";
+ 		my $sourcestat = stat($sourcepath);
+ 		utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
+ 		chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1251
retrieving revision 1.1252
diff -u -r1.1251 -r1.1252
--- openoffice.org.spec	17 Aug 2007 14:23:17 -0000	1.1251
+++ openoffice.org.spec	17 Aug 2007 17:57:33 -0000	1.1252
@@ -1169,9 +1169,9 @@
 cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
 cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{instdir}/program/sdraw.bin
 %if %{langpacks}
-chmod -R u+w $RPM_BUILD_ROOT/%{instdir}/program/resource/*.res
+chmod -R +w $RPM_BUILD_ROOT/%{instdir}
 dmake ooolanguagepack
-chmod -R u-w $RPM_BUILD_ROOT/%{instdir}/program/resource/*.res
+chmod -R -w $RPM_BUILD_ROOT/%{instdir}
 %endif
 export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}/sdk"
 export WITH_LANG="en-US"