rpms/openoffice.org/devel openoffice.org.spec,1.1488,1.1489

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
LGPLv2 -> LGPLv3


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1488
retrieving revision 1.1489
diff -u -r1.1488 -r1.1489
--- openoffice.org.spec	24 Apr 2008 07:04:03 -0000	1.1488
+++ openoffice.org.spec	24 Apr 2008 09:13:56 -0000	1.1489
@@ -45,7 +45,7 @@
 Version:        3.0.0
 Release: 	0.0.%{ooomilestone}.%{rh_rpm_release}%{?dist}
 Epoch:		1
-License:	LGPLv2 and LGPLv2+ and MPLv1.1 and BSD
+License:	LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
 Group:		Applications/Productivity
 URL:		http://www.openoffice.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -1360,20 +1360,40 @@
 #get an unpackaged raw install
 export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
 %if %{langpacks}
-if ! dmake broffice_pt-BR; then
-    echo - ---dump log start---
-    cat ../unx*.pro/BrOffice/rpm/logging/pt-BR/log_*_pt-BR.log
-    echo - ---dump log end---
-    dmake broffice_pt-BR
+for attempt in 1 2 3 4 5 6 7 8 9 10; do
+    echo Attempt $attempt
+    if dmake broffice_pt-BR; then
+        ok=true
+        break
+    else
+        echo - ---dump log start---
+        cat ../unx*.pro/BrOffice/rpm/logging/pt-BR/log_*_pt-BR.log
+        echo - ---dump log end---
+        export _MALLOC_CHECK=0
+        ok=false
+    fi
+done
+if [ $ok == "false" ]; then
+    exit 1
 fi
 rm -rf $RPM_BUILD_ROOT/%{ureinstdir}
 rm -rf $RPM_BUILD_ROOT/%{basisinstdir}
 %endif
-if ! dmake openoffice_en-US; then
-    echo - ---dump log start---
-    cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*_en-US.log
-    echo - ---dump log end---
-    dmake openoffice_en-US
+for attempt in 1 2 3 4 5 6 7 8 9 10; do
+    echo Attempt $attempt
+    if dmake openoffice_en-US; then
+        ok=true
+        break
+    else
+        echo - ---dump log start---
+        cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*_en-US.log
+        echo - ---dump log end---
+        export _MALLOC_CHECK=0
+        ok=false
+    fi
+done
+if [ $ok == "false" ]; then
+    exit 1
 fi
 chmod -R +w $RPM_BUILD_ROOT/%{baseinstdir} $RPM_BUILD_ROOT/%{oooinstdir}
 #provide an owner for these dir