test: test-ooo_lang_bcond.spec - expand was evil

[glen]

Author: glen                         Date: Mon Jan 30 15:31:27 2006 GMT
Module: test                          Tag: HEAD
---- Log message:
- expand was evil

---- Files affected:
test:
   test-ooo_lang_bcond.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: test/test-ooo_lang_bcond.spec
diff -u test/test-ooo_lang_bcond.spec:1.2 test/test-ooo_lang_bcond.spec:1.3
--- test/test-ooo_lang_bcond.spec:1.2	Mon Jan 30 15:58:52 2006
+++ test/test-ooo_lang_bcond.spec	Mon Jan 30 16:31:22 2006
@@ -1,10 +1,10 @@
 # $Revision$, $Date$
 %bcond_without	lang_all
 
-%define	_ooo_all_languages en_US et_EE fi_PL
-%{expand:%%define _ooo_languages %{!?_ooo_languages:%_ooo_all_languages}}
-
-%define	with_ooo_lang() %(echo %_ooo_languages | grep -c '%1')
+%define	_ooo_all_languages en-US de fr it et_EE
+# --define 'ooo_languages en-US pl_Chuck_Nooris.UTF-8'
+%define _ooo_languages %{?ooo_languages}%{!?ooo_languages:%{_ooo_all_languages}}
+%define	with_ooo_lang() %(echo ' %_ooo_languages ' | fgrep -c '%1')
 
 Summary:	test
 Name:		test
@@ -23,9 +23,17 @@
 echo "all_languages: [%{_ooo_all_languages}]"
 echo "languages: [%{_ooo_languages}]"
 %if %{with_ooo_lang et_EE}
-echo "have:et_EE"
+echo "have1:et_EE"
 %endif
 
+echo \
+./configure \
+%if "%{_ooo_languages}" == "%{_ooo_all_languages}"
+	--with-lang=ALL \
+%else
+	--with-lang="%{_ooo_languages}" \
+%endif
+	--need-beer=yes,/usr
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,13 +51,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2006/01/30 15:31:22  glen
+- expand was evil
+
 Revision 1.2  2006/01/30 14:58:52  glen
 - add macro for filelists
 btw, for testing:
 
  2917  /usr/bin/rpmbuild  -bp test-ooo_lang_bcond.spec
- 2918  /usr/bin/rpmbuild --define '_ooo_languages pl_PL' -bp test-ooo_lang_bcond.spec
+ 2918  /usr/bin/rpmbuild --define 'ooo_languages pl_PL' -bp test-ooo_lang_bcond.spec
 
 Revision 1.1  2006/01/30 14:38:18  glen
 - test for blekot
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/test/test-ooo_lang_bcond.spec?r1=1.2&r2=1.3&f=u