SPECS (OPENOFFICE_ORG_2_4): openoffice.org.spec - hopefully fixed broken di...

[hawk]

Author: hawk                         Date: Mon Jan  5 12:24:21 2009 GMT
Module: SPECS                         Tag: OPENOFFICE_ORG_2_4
---- Log message:
- hopefully fixed broken directory deps

---- Files affected:
SPECS:
   openoffice.org.spec (1.802.2.3 -> 1.802.2.4) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.802.2.3 SPECS/openoffice.org.spec:1.802.2.4
--- SPECS/openoffice.org.spec:1.802.2.3	Fri Nov 21 22:46:34 2008
+++ SPECS/openoffice.org.spec	Mon Jan  5 13:24:14 2009
@@ -22,16 +22,6 @@
 #	- configure --without-ppds --without afms
 #	- /share/config/soffice.cfg/global/accelerator/es/ should be in i18n-es
 #	- fix locale names and other locale related things
-#   - broken directory dependencies:
-#       error: openoffice.org-i18n-de-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swform/accelerator/de not found
-#       error: openoffice.org-i18n-de-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swreport/accelerator/de not found
-#       error: openoffice.org-i18n-de-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swxform/accelerator/de not found
-#       error: openoffice.org-i18n-es-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swform/accelerator/es not found
-#       error: openoffice.org-i18n-es-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swreport/accelerator/es not found
-#       error: openoffice.org-i18n-es-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swxform/accelerator/es not found
-#       error: openoffice.org-i18n-fr-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swform/accelerator/fr not found
-#       error: openoffice.org-i18n-fr-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swreport/accelerator/fr not found
-#       error: openoffice.org-i18n-fr-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swxform/accelerator/fr not found
 #   - can't be just i18n-{be,gu,hi,kn,pa,ta} instead of *-{be_BY,*_IN}?
 #   - more system libs todo:
 #	- (SYSTEM_HYPH) bcond system_libhnj doesn't work - needs Debian-patched version of libhnj
@@ -91,7 +81,7 @@
 %define		tag			%(echo %{mws} | tr A-Z a-z)-%{milestone}
 %define		milestone	m17
 %define		_tag		%(echo %{tag} | tr - _)
-%define		_rel		4
+%define		_rel		5
 
 Summary:	OpenOffice.org - powerful office suite
 Summary(pl.UTF-8):	OpenOffice.org - potężny pakiet biurowy
@@ -2586,8 +2576,11 @@
 		grep "/share/samples/${lang}/" ${lfile} >> ${lang}.lang || :
 		grep "/help/${lang}$" ${lfile} >> ${lang}.lang || :
 		grep "/help/${lang}/" ${lfile} >> ${lang}.lang || :
+		grep "/share/config/soffice.cfg/modules/swform/accelerator/${lang}$" build/common_list.txt >> ${lang}.lang || :
 		grep "/share/config/soffice.cfg/modules/swform/accelerator/${lang}/" build/common_list.txt >> ${lang}.lang || :
+		grep "/share/config/soffice.cfg/modules/swreport/accelerator/${lang}$" build/common_list.txt >> ${lang}.lang || :
 		grep "/share/config/soffice.cfg/modules/swreport/accelerator/${lang}/" build/common_list.txt >> ${lang}.lang || :
+		grep "/share/config/soffice.cfg/modules/swxform/accelerator/${lang}$" build/common_list.txt >> ${lang}.lang || :
 		grep "/share/config/soffice.cfg/modules/swxform/accelerator/${lang}/" build/common_list.txt >> ${lang}.lang || :
 	fi
 }
@@ -4195,6 +4188,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.802.2.4  2009/01/05 12:24:14  hawk
+- hopefully fixed broken directory deps
+
 Revision 1.802.2.3  2008/11/21 21:46:34  blues
 - don't require font with version
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org.spec?r1=1.802.2.3&r2=1.802.2.4&f=u