SPECS: openoffice.org.spec - AC-branch merge

[glen]

Author: glen                         Date: Fri Mar 16 18:00:30 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   openoffice.org.spec (1.731 -> 1.732) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.731 SPECS/openoffice.org.spec:1.732
--- SPECS/openoffice.org.spec:1.731	Fri Mar 16 10:27:12 2007
+++ SPECS/openoffice.org.spec	Fri Mar 16 19:00:25 2007
@@ -2114,6 +2114,12 @@
 [ "$RPM_BUILD_NR_THREADS" = "%{__make}" ] && RPM_BUILD_NR_THREADS=1
 RPM_BUILD_NR_THREADS=$(echo $RPM_BUILD_NR_THREADS)
 
+if [ -f "%{_javadir}/serializer.jar" ];then
+	serializer_jar=%{_javadir}/serializer.jar
+else
+	serializer_jar=%{_javadir}/xalan.jar
+fi
+
 CONFOPTS="\
 %ifarch %{ix86} \
 	--with-arch=x86 \
@@ -2137,11 +2143,7 @@
 	%{?with_system_libhnj:--with-system-altlinuxhyphen} \
 	%{?with_system_mdbtools:--with-system-mdbtools} \
 	%{?with_system_myspell:--with-system-myspell} \
-%if %{with system_xalan}
-	--with-system-xalan \
-	--with-xalan-jar=%{_javadir}/xalan.jar \
-	`[ -e "%{_javadir}/serializer.jar" ] && echo "--with-serializer-jar=%{_javadir}/serializer.jar" || echo "--with-serializer-jar=%{_javadir}/xalan.jar"`
-%endif
+	%{?with_system_xalan:--with-system-xalan --with-serializer-jar=$serializer_jar} \
 	%{?with_system_xerces:--with-system-xerces} \
 	%{?with_system_xml_apis:--with-system-xml-apis} \
 	%{?with_system_xt:--with-system-xt --with-xt-jar=%{_javadir}/classes} \
@@ -2233,8 +2235,12 @@
 
 :> distro-configs/Common.conf
 :> distro-configs/Common.conf.in
-echo "$CONFOPTS" > distro-configs/PLD.conf.in
-echo "$CONFOPTS" > distro-configs/PLD64.conf.in
+echo -n "$CONFOPTS" > distro-configs/PLD.conf.in
+echo -n "$CONFOPTS" > distro-configs/PLD64.conf.in
+if [ $(cat distro-configs/PLD.conf.in | wc -l) -gt 1 ]; then
+	: 'newline(s) found in distro-configs. some of the options might be lost'
+	exit 1
+fi
 
 # for cvs snaps
 [ -x ./autogen.sh ] && ./autogen.sh $CONFOPTS
@@ -3871,6 +3877,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.732  2007/03/16 18:00:25  glen
+- AC-branch merge
+
 Revision 1.731  2007/03/16 09:27:12  sparky
 - require javafilter only if java-enabled
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.731&r2=1.732&f=u