rpms/openoffice.org/devel openoffice.org.spec,1.267,1.268

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jul 5 07:56:59 UTC 2005


Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17692

Modified Files:
	openoffice.org.spec 
Log Message:
further changes


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- openoffice.org.spec	4 Jul 2005 10:03:13 -0000	1.267
+++ openoffice.org.spec	5 Jul 2005 07:56:56 -0000	1.268
@@ -1,5 +1,5 @@
 %define ooo2ver 114
-%define ooo_rpm_release 1
+%define ooo_rpm_release 2
 %define build_fc4 0
 %define build_fc5 1
 
@@ -108,6 +108,8 @@
 Patch45: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
 Patch46: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
 Patch47: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
+Patch48: openoffice.org-1.9.114.oooXXXXX.rpath.patch
+Patch49: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -734,6 +736,8 @@
 %patch45 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
 %patch46 -p1 -b .ooo43430.cvskk.np_sdk.patch
 %patch47 -p1 -b .ooo51385.bridges.stack.patch
+%patch48 -p1 -b .oooXXXXX.rpath.patch
+%patch49 -p1 -b .rh161886.rpath.desktop.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped
@@ -860,7 +864,7 @@
 for foo in `find $RPM_BUILD_ROOT/%{instdir}/program -name "*" -exec file {} \;| grep ": ELF" | cut -d: -f 1` ; do
 	chmod +wx $foo
 	ls -asl $foo
-	result=`readelf -d $foo | grep RPATH | grep \\\\[\\$ORIGIN\\\\]` || true
+	result=`readelf -d $foo | grep RPATH | grep \\\\[\\$ORIGIN` || true
         if [ "$result" == "" ]; then
                 echo "RPATH Warning: $foo is b0rked (-rpath missing)"
                 origin=1
@@ -983,6 +987,11 @@
 %{instdir}/share/registry/res/ar
 %dir %{instdir}/share/template
 %{instdir}/share/template/ar
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-af.xcu
 
 %files langpack-bg_BG
 %defattr(-,root,root)
@@ -1000,6 +1009,11 @@
 %{instdir}/share/registry/res/bg
 %dir %{instdir}/share/template
 %{instdir}/share/template/bg
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-bg.xcu
 
 %files langpack-bn_IN
 %defattr(-,root,root)
@@ -1013,6 +1027,11 @@
 %{instdir}/share/registry/res/bn
 %dir %{instdir}/share/template
 %{instdir}/share/template/bn
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-bn.xcu
 
 %files langpack-ca_ES
 %defattr(-,root,root)
@@ -1029,6 +1048,11 @@
 %{instdir}/share/registry/res/ca
 %dir %{instdir}/share/template
 %{instdir}/share/template/ca
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ca.xcu
 
 %files langpack-cs_CZ
 %defattr(-,root,root)
@@ -1046,6 +1070,11 @@
 %{instdir}/share/registry/res/cs
 %dir %{instdir}/share/template
 %{instdir}/share/template/cs
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-cs.xcu
 
 %files langpack-cy_GB
 %defattr(-,root,root)
@@ -1062,6 +1091,11 @@
 %{instdir}/share/registry/res/cy
 %dir %{instdir}/share/template
 %{instdir}/share/template/cy
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-cy.xcu
 
 %files langpack-da_DK
 %defattr(-,root,root)
@@ -1078,6 +1112,11 @@
 %{instdir}/share/registry/res/da
 %dir %{instdir}/share/template
 %{instdir}/share/template/da
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-da.xcu
 
 %files langpack-de
 %defattr(-,root,root)
@@ -1096,6 +1135,11 @@
 %{instdir}/share/registry/res/de
 %dir %{instdir}/share/template
 %{instdir}/share/template/de
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-de.xcu
 
 %files langpack-el_GR
 %defattr(-,root,root)
@@ -1112,6 +1156,11 @@
 %{instdir}/share/registry/res/el
 %dir %{instdir}/share/template
 %{instdir}/share/template/el
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-el.xcu
 
 %files langpack-es
 %defattr(-,root,root)
@@ -1130,6 +1179,12 @@
 %{instdir}/share/registry/res/es
 %dir %{instdir}/share/template
 %{instdir}/share/template/es
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-es.xcu
+
 
 %files langpack-et_EE
 %defattr(-,root,root)
@@ -1144,6 +1199,11 @@
 %{instdir}/share/registry/res/et
 %dir %{instdir}/share/template
 %{instdir}/share/template/et
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-et.xcu
 
 %files langpack-eu_ES
 %defattr(-,root,root)
@@ -1157,6 +1217,11 @@
 %{instdir}/share/registry/res/eu
 %dir %{instdir}/share/template
 %{instdir}/share/template/eu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-eu.xcu
 
 %files langpack-fi_FI
 %defattr(-,root,root)
@@ -1173,6 +1238,11 @@
 %{instdir}/share/registry/res/fi
 %dir %{instdir}/share/template
 %{instdir}/share/template/fi
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-fi.xcu
 
 %files langpack-fr
 %defattr(-,root,root)
@@ -1191,6 +1261,11 @@
 %{instdir}/share/registry/res/fr
 %dir %{instdir}/share/template
 %{instdir}/share/template/fr
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-fr.xcu
 
 %files langpack-gl_ES
 %defattr(-,root,root)
@@ -1207,6 +1282,11 @@
 %{instdir}/share/registry/res/gl
 %dir %{instdir}/share/template
 %{instdir}/share/template/gl
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-gl.xcu
 
 %files langpack-gu_IN
 %defattr(-,root,root)
@@ -1220,6 +1300,11 @@
 %{instdir}/share/registry/res/gu-IN
 %dir %{instdir}/share/template
 %{instdir}/share/template/gu-IN
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-gu-IN.xcu
 
 %files langpack-pa_IN
 %defattr(-,root,root)
@@ -1233,6 +1318,11 @@
 %{instdir}/share/registry/res/pa-IN
 %dir %{instdir}/share/template
 %{instdir}/share/template/pa-IN
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-pa-IN.xcu
 
 %files langpack-he_IL
 %defattr(-,root,root)
@@ -1249,6 +1339,11 @@
 %{instdir}/share/registry/res/he
 %dir %{instdir}/share/template
 %{instdir}/share/template/he
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-he.xcu
 
 %files langpack-hi_IN
 %defattr(-,root,root)
@@ -1262,6 +1357,11 @@
 %{instdir}/share/registry/res/hi-IN
 %dir %{instdir}/share/template
 %{instdir}/share/template/hi-IN
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-hi-IN.xcu
 
 %files langpack-hu_HU
 %defattr(-,root,root)
@@ -1278,6 +1378,11 @@
 %{instdir}/share/registry/res/hu
 %dir %{instdir}/share/template
 %{instdir}/share/template/hu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-hu.xcu
 
 %files langpack-hr_HR
 %defattr(-,root,root)
@@ -1294,6 +1399,11 @@
 %{instdir}/share/registry/res/hr
 %dir %{instdir}/share/template
 %{instdir}/share/template/hr
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-hr.xcu
 
 %files langpack-it
 %defattr(-,root,root)
@@ -1312,6 +1422,11 @@
 %{instdir}/share/registry/res/it
 %dir %{instdir}/share/template
 %{instdir}/share/template/it
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-it.xcu
 
 %files langpack-ja_JP
 %defattr(-,root,root)
@@ -1327,6 +1442,11 @@
 %{instdir}/share/registry/res/ja
 %dir %{instdir}/share/template
 %{instdir}/share/template/ja
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ja.xcu
 
 %files langpack-ko_KR
 %defattr(-,root,root)
@@ -1342,6 +1462,11 @@
 %{instdir}/share/registry/res/ko
 %dir %{instdir}/share/template
 %{instdir}/share/template/ko
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ko.xcu
 
 %files langpack-lt_LT
 %defattr(-,root,root)
@@ -1358,6 +1483,11 @@
 %{instdir}/share/registry/res/lt
 %dir %{instdir}/share/template
 %{instdir}/share/template/lt
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-lt.xcu
 
 %files langpack-ms_MY
 %defattr(-,root,root)
@@ -1374,6 +1504,11 @@
 %{instdir}/share/registry/res/ms
 %dir %{instdir}/share/template
 %{instdir}/share/template/ms
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ms.xcu
 
 %files langpack-nb_NO
 %defattr(-,root,root)
@@ -1390,6 +1525,11 @@
 %{instdir}/share/registry/res/nb
 %dir %{instdir}/share/template
 %{instdir}/share/template/nb
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-nb.xcu
 
 %files langpack-nl
 %defattr(-,root,root)
@@ -1408,6 +1548,11 @@
 %{instdir}/share/registry/res/nl
 %dir %{instdir}/share/template
 %{instdir}/share/template/nl
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-nl.xcu
 
 %files langpack-nn_NO
 %defattr(-,root,root)
@@ -1424,6 +1569,11 @@
 %{instdir}/share/registry/res/nn
 %dir %{instdir}/share/template
 %{instdir}/share/template/nn
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-nn.xcu
 
 %files langpack-pl_PL
 %defattr(-,root,root)
@@ -1440,6 +1590,11 @@
 %{instdir}/share/registry/res/pl
 %dir %{instdir}/share/template
 %{instdir}/share/template/pl
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-pl.xcu
 
 %files langpack-pt_PT
 %defattr(-,root,root)
@@ -1458,6 +1613,11 @@
 %{instdir}/share/registry/res/pt
 %dir %{instdir}/share/template
 %{instdir}/share/template/pt
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-pt.xcu
 
 %files langpack-pt_BR
 %defattr(-,root,root)
@@ -1476,6 +1636,11 @@
 %{instdir}/share/registry/res/pt-BR
 %dir %{instdir}/share/template
 %{instdir}/share/template/pt-BR
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-pt-BR.xcu
 
 %files langpack-ru
 %defattr(-,root,root)
@@ -1492,6 +1657,11 @@
 %{instdir}/share/registry/res/ru
 %dir %{instdir}/share/template
 %{instdir}/share/template/ru
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ru.xcu
 
 %files langpack-sk_SK
 %defattr(-,root,root)
@@ -1508,6 +1678,11 @@
 %{instdir}/share/registry/res/sk
 %dir %{instdir}/share/template
 %{instdir}/share/template/sk
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sk.xcu
 
 %files langpack-sl_SI
 %defattr(-,root,root)
@@ -1524,6 +1699,11 @@
 %{instdir}/share/registry/res/sl
 %dir %{instdir}/share/template
 %{instdir}/share/template/sl
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sl.xcu
 
 %files langpack-sv
 %defattr(-,root,root)
@@ -1542,6 +1722,11 @@
 %{instdir}/share/registry/res/sv
 %dir %{instdir}/share/template
 %{instdir}/share/template/sv
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sv.xcu
 
 %files langpack-ta_IN
 %defattr(-,root,root)
@@ -1555,6 +1740,11 @@
 %{instdir}/share/registry/res/ta-IN
 %dir %{instdir}/share/template
 %{instdir}/share/template/ta-IN
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ta-IN.xcu
 
 %files langpack-th_TH
 %defattr(-,root,root)
@@ -1568,6 +1758,11 @@
 %{instdir}/share/registry/res/th
 %dir %{instdir}/share/template
 %{instdir}/share/template/th
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-th.xcu
 
 %files langpack-tr_TR
 %defattr(-,root,root)
@@ -1581,6 +1776,11 @@
 %{instdir}/share/registry/res/tr
 %dir %{instdir}/share/template
 %{instdir}/share/template/tr
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-tr.xcu
 
 %files langpack-zh_CN
 %defattr(-,root,root)
@@ -1596,6 +1796,11 @@
 %{instdir}/share/registry/res/zh-CN
 %dir %{instdir}/share/template
 %{instdir}/share/template/zh-CN
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-zh-CN.xcu
 
 %files langpack-zh_TW
 %defattr(-,root,root)
@@ -1611,6 +1816,11 @@
 %{instdir}/share/registry/res/zh-TW
 %dir %{instdir}/share/template
 %{instdir}/share/template/zh-TW
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-zh-TW.xcu
 
 %files langpack-zu_ZA
 %defattr(-,root,root)
@@ -1627,6 +1837,11 @@
 %{instdir}/share/registry/res/zu
 %dir %{instdir}/share/template
 %{instdir}/share/template/zu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-zu.xcu
 
 %endif
 
@@ -1649,7 +1864,6 @@
 %{instdir}/help/en/sbasic.*
 %{instdir}/help/en/schart.*
 %{instdir}/help/en/shared.*
-%{instdir}/help/en/sdatabase.*
 %{instdir}/help/main_transform.xsl
 %{instdir}/presets
 %dir %{instdir}/program
@@ -1754,7 +1968,6 @@
 %{instdir}/program/libbindet680*.so
 %{instdir}/program/libcached1.so
 %{instdir}/program/libcanvastools680*.so
-%{instdir}/program/libcommuni680*.so
 %{instdir}/program/libcomphelp4gcc3.so
 %{instdir}/program/libcppcanvas680*.so
 %{instdir}/program/libcppu.so
@@ -1809,7 +2022,6 @@
 %{instdir}/program/libiti680*.so
 %{instdir}/program/libofficebean.so
 %{instdir}/program/libportaudio.so*
-%{instdir}/program/libsimplecm680*.so
 %{instdir}/program/libsndfile.so*
 %{instdir}/program/libfile680*.so
 %{instdir}/program/libfileacc.so
@@ -1932,7 +2144,6 @@
 %{instdir}/program/libvcl680*.so
 %{instdir}/program/libvclplug_*680*.so
 %{instdir}/program/libvos3gcc3.so
-%{instdir}/program/libwpft680*.so
 %{instdir}/program/libxcr680*.so
 %{instdir}/program/libxmlfa680*.so
 %{instdir}/program/libxmlfd680*.so
@@ -2036,7 +2247,6 @@
 %{instdir}/program/shlibloader.uno.so
 %{instdir}/program/simplereg.uno.so
 %{instdir}/program/slideshow.uno.so
-%{instdir}/program/sbase
 %{instdir}/program/setofficelang*
 %{instdir}/program/soffice
 %{instdir}/program/soffice.bin
@@ -2151,7 +2361,19 @@
 %dir %{instdir}/share/registry/ldap
 %{instdir}/share/registry/ldap/oo-ad-ldap-attr.map
 %{instdir}/share/registry/ldap/oo-ldap-attr.map
-%{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%{instdir}/share/registry/modules/org/openoffice/Office/Embedding
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/*cjk*
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/*ctl*
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-korea.xcu
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-en-US.xcu
 %dir %{instdir}/share/registry/res
 %{instdir}/share/registry/res/en-US
 %dir %{instdir}/share/registry/schema
@@ -2246,7 +2468,6 @@
 %{instdir}/program/liblnth680*.so
 #launchers
 %{_bindir}/openoffice.org-1.9
-%{_bindir}/oobase
 %{_bindir}/ooffice
 %{_bindir}/ooviewdoc
 #gnome integration
@@ -2258,7 +2479,19 @@
 %{_datadir}/icons
 %dir %{_datadir}/mime-info
 %{_datadir}/mime-info/*
-#.desktops
+#datebase files, create a seperate package ?
+%{instdir}/help/en/sdatabase.*
+%{instdir}/program/sbase
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
+%{_bindir}/oobase
 %dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-1.9-base.desktop
 %dir %{_datadir}/mimelnk
@@ -2312,6 +2545,19 @@
 %dir %{instdir}/share/registry/data/org/openoffice/Office/UI
 %{instdir}/share/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-calc.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-calc.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_calc_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_calc_types.xcu
 %dir %{instdir}/share/registry/schema
 %dir %{instdir}/share/registry/schema/org
 %dir %{instdir}/share/registry/schema/org/openoffice
@@ -2348,9 +2594,22 @@
 %dir %{instdir}/share/registry/data/org/openoffice/Office
 %dir %{instdir}/share/registry/data/org/openoffice/Office/UI
 %{instdir}/share/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-draw.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-draw.xcu
+%dir /share/registry/modules/org/openoffice/TypeDetection
+%dir /share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_draw_filters.xcu
+%dir /share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_draw_types.xcu
 %dir %{instdir}/share/registry/schema
 %dir %{instdir}/share/registry/schema/org
-%dir %dir %{instdir}/share/registry/schema/org/openoffice
+%dir %{instdir}/share/registry/schema/org/openoffice
 %dir %{instdir}/share/registry/schema/org/openoffice/Office
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
@@ -2377,6 +2636,7 @@
 %{instdir}/program/libhwp.so
 %{instdir}/program/libswd680*.so
 %{instdir}/program/libswui680*.so
+%{instdir}/program/libwpft680*.so
 %{instdir}/program/swriter
 %dir %{instdir}/share
 %dir %{instdir}/share/registry
@@ -2389,6 +2649,24 @@
 %{instdir}/share/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-writer.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-writer.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_global_filters.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_web_filters.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_writer_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_global_types.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_web_types.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_writer_types.xcu
 %dir %{instdir}/share/registry/schema
 %dir %{instdir}/share/registry/schema/org
 %dir %{instdir}/share/registry/schema/org/openoffice
@@ -2434,6 +2712,19 @@
 %dir %{instdir}/share/registry/data/org/openoffice/Office/UI
 %{instdir}/share/registry/data/org/openoffice/Office/UI/Effects.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-impress.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-impress.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_impress_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_impress_types.xcu
 %dir %{instdir}/share/registry/schema
 %dir %{instdir}/share/registry/schema/org
 %dir %{instdir}/share/registry/schema/org/openoffice
@@ -2478,6 +2769,19 @@
 %dir %{instdir}/share/registry/data/org/openoffice/Office/UI
 %{instdir}/share/registry/data/org/openoffice/Office/UI/MathCommands.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-math.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-math.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_math_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_math_types.xcu
 %dir %{instdir}/share/registry/schema
 %dir %{instdir}/share/registry/schema/org
 %dir %{instdir}/share/registry/schema/org/openoffice
@@ -2503,11 +2807,32 @@
 %dir %{instdir}/program
 %{instdir}/program/libflash680*.so
 %{instdir}/program/libsvgfilter680*.so
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_drawgraphics_filters.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_impressgraphics_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_drawgraphics_types.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_impressgraphics_types.xcu
+
 
 %files xsltfilter
 %defattr(-,root,root)
 %dir %{instdir}
 %dir %{instdir}/share
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_xslt_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_xslt_types.xcu
 %dir %{instdir}/share/xslt
 %{instdir}/share/xslt/docbook
 %dir %{instdir}/share/xslt/export
@@ -2541,9 +2866,11 @@
 %dir %{instdir}
 %dir %{instdir}/program
 %{instdir}/program/hid.lst
+%{instdir}/program/libcommuni680*.so
+%{instdir}/program/libsimplecm680*.so
+%{instdir}/program/testtool.bin
 %dir %{instdir}/program/resource
 %{instdir}/program/resource/stt680en-US.res
-%{instdir}/program/testtool.bin
 
 %files pyuno
 %defattr(-,root,root)
@@ -2569,6 +2896,13 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Jul 04 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.114-2
+- further split langpacks
+- modify test for $ORIGIN rpaths
+- rh#161886# 
+    + openoffice.org-1.9.114.oooXXXXX.rpath.patch
+    + openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+
 * Mon Jul 04 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.114-1
 - bump to next version
 




More information about the fedora-cvs-commits mailing list