SPECS (AC-branch): openoffice.org.spec - newlines do bad in distro...

[glen]

Author: glen                         Date: Fri Mar 16 01:53:38 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- newlines do bad in distro-config

---- Files affected:
SPECS:
   openoffice.org.spec (1.704.2.31 -> 1.704.2.32) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.31 SPECS/openoffice.org.spec:1.704.2.32
--- SPECS/openoffice.org.spec:1.704.2.31	Thu Mar 15 19:10:10 2007
+++ SPECS/openoffice.org.spec	Fri Mar 16 02:53:33 2007
@@ -2113,6 +2113,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 \
@@ -2136,10 +2142,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 \
-	`[ -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} \
@@ -2230,8 +2233,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
@@ -3868,6 +3875,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.704.2.32  2007/03/16 01:53:33  glen
+- newlines do bad in distro-config
+
 Revision 1.704.2.31  2007/03/15 18:10:10  glen
 - pl via: cvs diff -u -r1.727 -r1.730 './openoffice.org.spec' | iconv -futf8 -tlatin2 | sed -e 's,\.UTF-8,,' | patch
 
================================================================

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