SPECS (AC-branch): openoffice.org.spec - allow skipping ooo-instal...

[glen]

Author: glen                         Date: Thu Mar  8 22:12:19 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- allow skipping ooo-installation stage
- package share/samples/$lang dirs

---- Files affected:
SPECS:
   openoffice.org.spec (1.704.2.22 -> 1.704.2.23) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.22 SPECS/openoffice.org.spec:1.704.2.23
--- SPECS/openoffice.org.spec:1.704.2.22	Thu Mar  8 17:22:30 2007
+++ SPECS/openoffice.org.spec	Thu Mar  8 23:12:13 2007
@@ -2235,6 +2235,7 @@
 fi
 
 %install
+if [ ! -f installed.stamp -o ! -d $RPM_BUILD_ROOT ]; then
 rm -rf $RPM_BUILD_ROOT
 
 # limit to single process installation, it's safe at least
@@ -2311,6 +2312,24 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libgcc_s.so* \
 	$RPM_BUILD_ROOT%{_libdir}/%{name}/program/libstdc++*so*
 
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.so
+
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
+rm -rf $RPM_BUILD_ROOT/opt/gnome
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/cde-open-url
+
+%if %{without java}
+# Java-releated bits
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/hid.lst
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/java-set-classpath
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/jvmfwk3rc
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/beanshell
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/javascript
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xslt
+%endif
+
+fi # installing
+
 # Find out locales
 find_lang() {
 	local lang="$1"
@@ -2323,8 +2342,8 @@
 
 	lfile="build/lang_${lang}_list.txt"
 	if [ -f ${lfile} ]; then
-		lprefix="`bin/openoffice-xlate-lang -p ${lang} 2>/dev/null || echo ""`"
-		longlang="`bin/openoffice-xlate-lang -l ${lang} 2>/dev/null || echo ""`"
+		lprefix=$(bin/openoffice-xlate-lang -p ${lang} 2>/dev/null || :)
+		longlang=$(bin/openoffice-xlate-lang -l ${lang} 2>/dev/null || :)
 		# share/*/${longlang}
 		if [ "x${longlang}" != "x" ] ; then
 			grep "^%%dir.*/${longlang}/\$" ${lfile} > tmp.lang || :
@@ -2366,6 +2385,9 @@
 		# lib/openoffice.org/share/wordbook/$lang
 		grep "/share/wordbook/${lang}$" ${lfile} >> ${lang}.lang || :
 		grep "/share/wordbook/${lang}/" ${lfile} >> ${lang}.lang || :
+		# lib/openoffice.org/share/samples/$lang
+		grep "/share/samples/${lang}$" ${lfile} >> ${lang}.lang || :
+		grep "/share/samples/${lang}/" ${lfile} >> ${lang}.lang || :
 		%if %{with java}
 		grep "/help/${lang}$" ${lfile} >> ${lang}.lang || :
 		grep "/help/${lang}/" ${lfile} >> ${lang}.lang || :
@@ -2374,28 +2396,12 @@
 }
 
 rm -f *.lang*
-langlist="`ls build/lang_*_list.txt|sed -e 's=build/lang_\(.*\)_list.txt=\1=g'`"
+langlist=$(ls build/lang_*_list.txt | sed -e 's=build/lang_\(.*\)_list.txt=\1=g')
 
 for lang in $langlist; do
 	find_lang $lang
 done
 
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.so
-
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
-rm -rf $RPM_BUILD_ROOT/opt/gnome
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/cde-open-url
-
-%if %{without java}
-# Java-releated bits
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/hid.lst
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/java-set-classpath
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/jvmfwk3rc
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/beanshell
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/javascript
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xslt
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -2518,6 +2524,7 @@
 %{_libdir}/%{name}/share/gallery
 %{_libdir}/%{name}/share/psprint
 %dir %{_libdir}/%{name}/share/samples
+%dir %{_libdir}/%{name}/share/samples/en-US
 %dir %{_libdir}/%{name}/share/template
 %dir %{_libdir}/%{name}/share/template/wizard
 %dir %{_libdir}/%{name}/share/template/wizard/letter
@@ -3791,6 +3798,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.704.2.23  2007/03/08 22:12:13  glen
+- allow skipping ooo-installation stage
+- package share/samples/$lang dirs
+
 Revision 1.704.2.22  2007/03/08 16:22:30  glen
 - plugin needs to be in ooo dir
 
================================================================

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