packages: libreoffice/libreoffice.spec - don't let autoreconf to break the ...

baggins baggins at pld-linux.org
Sat Feb 25 19:09:28 CET 2012


Author: baggins                      Date: Sat Feb 25 18:09:28 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't let autoreconf to break the build
- updated files
- testtools are gone

---- Files affected:
packages/libreoffice:
   libreoffice.spec (1.933 -> 1.934) 

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.933 packages/libreoffice/libreoffice.spec:1.934
--- packages/libreoffice/libreoffice.spec:1.933	Sat Feb 25 11:06:59 2012
+++ packages/libreoffice/libreoffice.spec	Sat Feb 25 19:09:23 2012
@@ -223,12 +223,13 @@
 Requires:	%{name}-presenter-screen = %{version}-%{release}
 Requires:	%{name}-pyuno = %{version}-%{release}
 Requires:	%{name}-report-builder = %{version}-%{release}
-Requires:	%{name}-testtools = %{version}-%{release}
 Requires:	%{name}-web = %{version}-%{release}
 Requires:	%{name}-wiki-publisher = %{version}-%{release}
 Requires:	%{name}-writer = %{version}-%{release}
 Requires:	%{name}-xsltfilter = %{version}-%{release}
 Obsoletes:	openoffice.org
+Obsoletes:	openoffice.org-testtools
+Obsoletes:	libreoffice-testtools
 ExclusiveArch:	%{ix86} %{x8664} ppc sparc sparcv9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -238,12 +239,8 @@
 # - share/ - 17000 files of 415M
 # - help/ - 6500 files of 1.4G
 # - program/resource/ - 5610 files of 216M
-%define		_noautostrip	.*\\(%{_datadir}\\|%{_libdir}/%{name}/basis*/program/resource\\)/.*
-%define		_noautochrpath	.*\\(%{_datadir}\\|%{_libdir}/%{name}/basis*/program/resource\\)/.*
-
-%define		basis		basis3.4
-%define		basisdir	%{_libdir}/%{name}/%{basis}
-%define		databasisdir	%{_datadir}/%{name}/%{basis}
+%define		_noautostrip	.*\\(%{_datadir}\\|%{_libdir}/%{name}/program/resource\\)/.*
+%define		_noautochrpath	.*\\(%{_datadir}\\|%{_libdir}/%{name}/program/resource\\)/.*
 
 %description
 LibreOffice is an open-source project sponsored by Sun Microsystems
@@ -646,19 +643,6 @@
 Moduł javafilter dla LibreOffice, udostępnia dodatkowe filtry importu
 aportisdoc, Pocket Excel i Pocket Word.
 
-%package testtools
-Summary:	testtools for LibreOffice
-Summary(pl.UTF-8):	Narzędzia testowe dla LibreOffice
-Group:		Development/Libraries
-Requires:	%{name}-core = %{version}-%{release}
-Obsoletes:	openoffice.org-testtools
-
-%description testtools
-QA tools for LibreOffice, enables automated testing.
-
-%description testtools -l pl.UTF-8
-Narzędzia QA dla LibreOffice, pozwalają na automatyczne testowanie.
-
 # FIXME
 %package ure
 Summary:	UNO Runtime Environment
@@ -2481,9 +2465,6 @@
 export CXX="%{__cxx}"
 export CPP="%{__cpp}"
 
-%{__aclocal}
-%{__autoconf}
-
 export IGNORE_MANIFEST_CHANGES=1
 export QT4INC="%{_includedir}/qt4"
 export QT4LIB="%{_libdir}"
@@ -2501,7 +2482,6 @@
 fi
 %endif
 
-
 %if %{with parallelbuild}
 RPM_BUILD_NR_THREADS=$(echo %{_smp_mflags} | cut -dj -f2)
 [ -z "$RPM_BUILD_NR_THREADS" ] && RPM_BUILD_NR_THREADS=1
@@ -2509,6 +2489,10 @@
 RPM_BUILD_NR_THREADS="1"
 %endif
 
+%{__aclocal}
+%{__autoconf}
+touch autogen.lastrun
+
 %configure \
 	--with-num-cpus=$RPM_BUILD_NR_THREADS \
 	--with-max-jobs=1 \
@@ -2655,23 +2639,23 @@
 
 	# unpack report-builder extension
 	install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/report-builder
-	unzip solver/unxlng*/bin/report-builder.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/report-builder
+	unzip -o solver/unxlng*/bin/report-builder.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/report-builder
 
 	# unpack wiki-publisher extension
 	install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/wiki-publisher
-	unzip solver/unxlng*/bin/swext/wiki-publisher.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/wiki-publisher
+	unzip -o solver/unxlng*/bin/wiki-publisher.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/wiki-publisher
 
 	# unpack presentation-minimizer extension
 	install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/presentation-minimizer
-	unzip solver/unxlng*/bin/minimizer/presentation-minimizer.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/presentation-minimizer
+	unzip -o solver/unxlng*/bin/minimizer/presentation-minimizer.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/presentation-minimizer
 
 	# unpack presenter screen extension
 	install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/presenter-screen
-	unzip solver/unxlng*/bin/presenter/presenter-screen.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/presenter-screen
+	unzip -o solver/unxlng*/bin/presenter/presenter-screen.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/presenter-screen
 
 	# unpack pdfimport extension
 	install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/pdfimport
-	unzip solver/unxlng*/bin/pdfimport/pdfimport.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/pdfimport
+	unzip -o solver/unxlng*/bin/pdfimport/pdfimport.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/pdfimport
 
 	# save orignal install layout
 	find $RPM_BUILD_ROOT -ls > ls.txt
@@ -2688,18 +2672,18 @@
 
 	%if %{with mozilla}
 	install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
-	ln -s %{basisdir}/program/libnpsoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+	ln -s %{_libdir}/%{name}/program/libnpsoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
 	%endif
 
 	perl -pi -e 's/^[       ]*LD_LIBRARY_PATH/# LD_LIBRARY_PATH/;s/export LD_LIBRARY_PATH/# export LD_LIBRARY_PATH/' \
-		$RPM_BUILD_ROOT%{basisdir}/program/setup
+		$RPM_BUILD_ROOT%{_libdir}/%{name}/program/setup
 
-	chmod +x $RPM_BUILD_ROOT%{basisdir}/program/*.so
+	chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.so
 
-	install -d $RPM_BUILD_ROOT%{databasisdir}
+	install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 	# put share to %{_datadir} so we're able to produce noarch packages
-	mv $RPM_BUILD_ROOT%{basisdir}/help $RPM_BUILD_ROOT/%{databasisdir}
-	ln -s ../../../share/%{name}/%{basis}/help $RPM_BUILD_ROOT%{basisdir}/help
+	mv $RPM_BUILD_ROOT%{_libdir}/%{name}/help $RPM_BUILD_ROOT/%{_datadir}/%{name}
+	ln -s ../../../share/%{name}/help $RPM_BUILD_ROOT%{_libdir}/%{name}/help
 	mv $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes $RPM_BUILD_ROOT%{_datadir}/%{name}
 	ln -s ../../share/%{name}/readmes $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes
 
@@ -2770,23 +2754,23 @@
 		# lib/openoffice.org/share/autotext/$lang
 		grep "/share/autotext/${lang}$" ${lfile} >> ${langfn}.lang || :
 		grep "/share/autotext/${lang}/" ${lfile} >> ${langfn}.lang || :
-		# %{basisdir}/share/registry/.*[_-]$lang.xcd
+		# %{_libdir}/%{name}/share/registry/.*[_-]$lang.xcd
 		grep "/share/registry/.*[_-]${lang}.xcd$" ${lfile} >> ${langfn}.lang || :
-		# %{basisdir}/share/template/$lang
+		# %{_libdir}/%{name}/share/template/$lang
 		grep "/share/template/${lang}$" ${lfile} >> ${langfn}.lang || :
 		grep "/share/template/${lang}/" ${lfile} >> ${langfn}.lang || :
-		# %{basisdir}/share/template/wizard/letter/lang
+		# %{_libdir}/%{name}/share/template/wizard/letter/lang
 		grep "/share/template/wizard/letter/${lang}$" ${lfile} >> ${langfn}.lang || :
 		grep "/share/template/wizard/letter/${lang}$" file-lists/common_list.txt >> ${langfn}.lang || :
 		grep "/share/template/wizard/letter/${lang}/" ${lfile} >> ${langfn}.lang || :
 		grep "/share/template/wizard/letter/${lang}/" file-lists/common_list.txt >> ${langfn}.lang || :
-		# %{basisdir}/share/wordbook/$lang
+		# %{_libdir}/%{name}/share/wordbook/$lang
 		grep "/share/wordbook/${lang}$" ${lfile} >> ${langfn}.lang || :
 		grep "/share/wordbook/${lang}/" ${lfile} >> ${langfn}.lang || :
-		# %{basisdir}/share/samples/$lang
+		# %{_libdir}/%{name}/share/samples/$lang
 		grep "/share/samples/${lang}$" ${lfile} >> ${langfn}.lang || :
 		grep "/share/samples/${lang}/" ${lfile} >> ${langfn}.lang || :
-		# %{basisdir}/help/$lang
+		# %{_libdir}/%{name}/help/$lang
 		grep "/help/${lang}$" ${lfile} >> ${langfn}.lang || :
 		grep "/help/${lang}/" ${lfile} >> ${langfn}.lang || :
 	fi
@@ -2802,7 +2786,7 @@
 
 %{__sed} -i -e '
 	s,%{_libdir}/%{name}/readmes,%{_datadir}/%{name}/readmes,;
-	s,%{basisdir}/help,%{databasisdir}/help,;
+	s,%{_libdir}/%{name}/help,%{_datadir}/%{name}/help,;
 ' *.lang
 %endif
 
@@ -2907,448 +2891,310 @@
 %attr(755,root,root) %{_bindir}/soffice
 %attr(755,root,root) %{_bindir}/unopkg
 
-%dir %{basisdir}
-%dir %{databasisdir}
-%dir %{databasisdir}/help
-%{databasisdir}/help/*.xsl
-%dir %{databasisdir}/help/en
-%{databasisdir}/help/en/*.html
-%{databasisdir}/help/en/*.css
-%{databasisdir}/help/en/sbasic.*
-%{databasisdir}/help/en/schart.*
-%{databasisdir}/help/en/shared.*
-
-%dir %{basisdir}/presets
-%dir %{basisdir}/presets/autotext
-%{basisdir}/presets/autotext/mytexts.bau
-%{basisdir}/presets/basic
-%dir %{basisdir}/presets/config
-%{basisdir}/presets/config/autotbl.fmt
-%{basisdir}/presets/config/*.so[bcdegh]
-%{basisdir}/presets/database
-%{basisdir}/presets/gallery
-%{basisdir}/presets/psprint
-
-%dir %{basisdir}/program
-%attr(755,root,root) %{basisdir}/program/basprov*.uno.so
-%attr(755,root,root) %{basisdir}/program/cairocanvas.uno.so
-%attr(755,root,root) %{basisdir}/program/canvasfactory.uno.so
-%attr(755,root,root) %{basisdir}/program/cde-open-url
-%attr(755,root,root) %{basisdir}/program/cmdmail.uno.so
-%attr(755,root,root) %{basisdir}/program/configmgr.uno.so
-%attr(755,root,root) %{basisdir}/program/deployment*.uno.so
-%attr(755,root,root) %{basisdir}/program/desktopbe1.uno.so
-%attr(755,root,root) %{basisdir}/program/dlgprov*.uno.so
-%attr(755,root,root) %{basisdir}/program/fastsax.uno.so
-%attr(755,root,root) %{basisdir}/program/fpicker.uno.so
-%attr(755,root,root) %{basisdir}/program/fps_office.uno.so
-%attr(755,root,root) %{basisdir}/program/fsstorage.uno.so
-%attr(755,root,root) %{basisdir}/program/hatchwindowfactory.uno.so
-%attr(755,root,root) %{basisdir}/program/i18npool.uno.so
-%attr(755,root,root) %{basisdir}/program/i18nsearch.uno.so
-%attr(755,root,root) %{basisdir}/program/java-set-classpath
-%attr(755,root,root) %{basisdir}/program/ldapbe2.uno.so
-%attr(755,root,root) %{basisdir}/program/libaccl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libadabasl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libavmediagst.so
-%attr(755,root,root) %{basisdir}/program/libavmedial[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbasctll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbasebmpl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbasegfxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbibl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libcached1.so
-%attr(755,root,root) %{basisdir}/program/libcanvastoolsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libchartcontrollerl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libchartmodell[ipx].so
-%attr(755,root,root) %{basisdir}/program/libcharttoolsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libchartviewl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libcollator_data.so
-%attr(755,root,root) %{basisdir}/program/libcomphelpgcc3.so
-%attr(755,root,root) %{basisdir}/program/libcppcanvasl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libctll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libcuil[ipx].so
-%{!?with_system_db:%attr(755,root,root) %{basisdir}/program/libdb-4.2.so}
-%attr(755,root,root) %{basisdir}/program/libdbal[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdbasel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdbaxmll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdbmml[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdbpool2.so
-%attr(755,root,root) %{basisdir}/program/libdbtoolsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdbul[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdeploymentmiscl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdesktop_detectorl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdict_ja.so
-%attr(755,root,root) %{basisdir}/program/libdict_zh.so
-%attr(755,root,root) %{basisdir}/program/libdrawinglayerl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libeditengl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libegil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libembobj.so
-%attr(755,root,root) %{basisdir}/program/libemboleobj.so
-%attr(755,root,root) %{basisdir}/program/libemel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libepbl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libepgl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libeppl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libepsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libeptl[ipx].so
-%attr(755,root,root) %{basisdir}/program/liberal[ipx].so
-%attr(755,root,root) %{basisdir}/program/libetil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libevtatt.so
-%attr(755,root,root) %{basisdir}/program/libexpl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfileacc.so
-%attr(755,root,root) %{basisdir}/program/libfilel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfilterconfig1.so
-%attr(755,root,root) %{basisdir}/program/libflatl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libforl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libforuil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfrml[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfwel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfwil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfwkl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfwll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfwml[ipx].so
-%attr(755,root,root) %{basisdir}/program/libguesslangl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libhelplinkerl[ipx].so
-%{!?with_system_hunspell:%attr(755,root,root) %{basisdir}/program/libhunspell.so}
-%attr(755,root,root) %{basisdir}/program/libhyphenl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libi18nisolang1gcc3.so
-%attr(755,root,root) %{basisdir}/program/libi18npaperl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libi18nregexpgcc3.so
-%attr(755,root,root) %{basisdir}/program/libi18nutilgcc3.so
-%attr(755,root,root) %{basisdir}/program/libicdl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libicgl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libidxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libindex_data.so
-%attr(755,root,root) %{basisdir}/program/libimel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libipbl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libipdl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libipsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libiptl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libipxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libiral[ipx].so
-%attr(755,root,root) %{basisdir}/program/libitgl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libitil[ipx].so
-%attr(755,root,root) %{basisdir}/program/liblngl[ipx].so
-%attr(755,root,root) %{basisdir}/program/liblnthl[ipx].so
-%attr(755,root,root) %{basisdir}/program/liblocaledata_en.so
-%attr(755,root,root) %{basisdir}/program/liblocaledata_es.so
-%attr(755,root,root) %{basisdir}/program/liblocaledata_euro.so
-%attr(755,root,root) %{basisdir}/program/liblocaledata_others.so
-%attr(755,root,root) %{basisdir}/program/liblogl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libmcnttype.so
-%attr(755,root,root) %{basisdir}/program/libmozbootstrap.so
-%attr(755,root,root) %{basisdir}/program/libmsfilterl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libmtfrenderer.uno.so
-%attr(755,root,root) %{basisdir}/program/libmysqll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libodbcl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libodbcbasel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libodfflatxmll[ipx].so
-%attr(755,root,root) %{basisdir}/program/liboffaccl[ipx].so
-%attr(755,root,root) %{basisdir}/program/liboooimprovecorel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libooxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libpackage2.so
-%attr(755,root,root) %{basisdir}/program/libpcrl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libpdffilterl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libpll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libpreloadl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libprotocolhandlerl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libqstart_gtkl[ipx].so
-%attr(755,root,root) %{basisdir}/program/librecentfile.so
-%attr(755,root,root) %{basisdir}/program/libresl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsaxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsbl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libscnl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libscriptframe.so
-%attr(755,root,root) %{basisdir}/program/libsdbc2.so
-%attr(755,root,root) %{basisdir}/program/libsdbtl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsddl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsdfiltl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsdl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsduil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsfxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsofficeapp.so
-%attr(755,root,root) %{basisdir}/program/libsotl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libspal[ipx].so
-%attr(755,root,root) %{basisdir}/program/libspelll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libspl_unxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libspll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsrtrs1.so
-%attr(755,root,root) %{basisdir}/program/libstsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsvll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsvtl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsvxcorel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsvxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libswl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libtextconv_dict.so
-%attr(755,root,root) %{basisdir}/program/libtextconversiondlgsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libtkl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libtll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libtvhlp1.so
-%attr(755,root,root) %{basisdir}/program/libucb1.so
-%attr(755,root,root) %{basisdir}/program/libucbhelper4gcc3.so
-%attr(755,root,root) %{basisdir}/program/libucpchelp1.so
-%attr(755,root,root) %{basisdir}/program/libucpdav1.so
-%attr(755,root,root) %{basisdir}/program/libucpfile1.so
-%attr(755,root,root) %{basisdir}/program/libucpftp1.so
-%attr(755,root,root) %{basisdir}/program/libucphier1.so
-%attr(755,root,root) %{basisdir}/program/libucppkg1.so
-%attr(755,root,root) %{basisdir}/program/libunopkgapp.so
-%attr(755,root,root) %{basisdir}/program/libunordfl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libunoxmll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libupdchkl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libutll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libuuil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libvbahelperl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libvcll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libvclplug_genl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libvclplug_svpl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxcrl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxmlfal[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxmlfdl[ipx].so
+%dir %{_libdir}/%{name}
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/help
+%{_datadir}/%{name}/help/*.xsl
+%dir %{_datadir}/%{name}/help/en
+%{_datadir}/%{name}/help/en/*.html
+%{_datadir}/%{name}/help/en/*.css
+%{_datadir}/%{name}/help/en/sbasic.*
+%{_datadir}/%{name}/help/en/schart.*
+%{_datadir}/%{name}/help/en/shared.*
+
+%dir %{_libdir}/%{name}/presets
+%dir %{_libdir}/%{name}/presets/autotext
+%{_libdir}/%{name}/presets/autotext/mytexts.bau
+%{_libdir}/%{name}/presets/basic
+%dir %{_libdir}/%{name}/presets/config
+%{_libdir}/%{name}/presets/config/autotbl.fmt
+%{_libdir}/%{name}/presets/config/*.so[bcdegh]
+%{_libdir}/%{name}/presets/database
+%{_libdir}/%{name}/presets/gallery
+%{_libdir}/%{name}/presets/psprint
+
+%dir %{_libdir}/%{name}/program
+%attr(755,root,root) %{_libdir}/%{name}/program/basprov*.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/cairocanvas.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/canvasfactory.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/cde-open-url
+%attr(755,root,root) %{_libdir}/%{name}/program/cmdmail.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/configmgr.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/desktopbe1.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/dlgprov*.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/fastsax.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/fpicker.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/fps_office.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/fsstorage.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/hatchwindowfactory.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/i18npool.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/i18nsearch.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/java-set-classpath
+%attr(755,root,root) %{_libdir}/%{name}/program/ldapbe2.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libavmediagst.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcached1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcollator_data.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcomphelpgcc3.so
+%{!?with_system_db:%attr(755,root,root) %{_libdir}/%{name}/program/libdb-4.2.so}
+%attr(755,root,root) %{_libdir}/%{name}/program/libdbpool2.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdict_ja.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdict_zh.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libembobj.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libemboleobj.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfileacc.so
+%{!?with_system_hunspell:%attr(755,root,root) %{_libdir}/%{name}/program/libhunspell.so}
+%attr(755,root,root) %{_libdir}/%{name}/program/libi18nisolang1gcc3.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libi18nutilgcc3.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libindex_data.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblocaledata_en.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblocaledata_es.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblocaledata_euro.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblocaledata_others.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmcnttype.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmozbootstrap.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpackage2.so
+%attr(755,root,root) %{_libdir}/%{name}/program/librecentfile.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libscriptframe.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsdbc2.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsofficeapp.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsrtrs1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libtextconv_dict.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libtvhlp1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucb1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucbhelper4gcc3.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpchelp1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpdav1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpfile1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpftp1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucphier1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucppkg1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libunopkgapp.so
 ## maybe external is possible?
 # - external broken in 3.0.1
-###%attr(755,root,root) %{basisdir}/program/libxmlsec1*.so
+###%attr(755,root,root) %{_libdir}/%{name}/program/libxmlsec1*.so
 ##
-%attr(755,root,root) %{basisdir}/program/libxmlsecurity.so
-%attr(755,root,root) %{basisdir}/program/libxmxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxofl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxol[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxsec_fw.so
-%attr(755,root,root) %{basisdir}/program/libxsec_xmlsec.so
-%attr(755,root,root) %{basisdir}/program/libxsltdlgl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxsltfilterl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxstor.so
-%attr(755,root,root) %{basisdir}/program/localebe1.uno.so
-%attr(755,root,root) %{basisdir}/program/migrationoo2.uno.so
-%attr(755,root,root) %{basisdir}/program/migrationoo3.uno.so
-%attr(755,root,root) %{basisdir}/program/msforms.uno.so
-%attr(755,root,root) %{basisdir}/program/open-url
-%attr(755,root,root) %{basisdir}/program/pagein*
-%attr(755,root,root) %{basisdir}/program/passwordcontainer.uno.so
-%attr(755,root,root) %{basisdir}/program/pluginapp.bin
-%attr(755,root,root) %{basisdir}/program/productregistration.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxmlsecurity.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxsec_fw.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxsec_xmlsec.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxstor.so
+%attr(755,root,root) %{_libdir}/%{name}/program/localebe1.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/migrationoo2.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/migrationoo3.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/msforms.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/open-url
+%attr(755,root,root) %{_libdir}/%{name}/program/pagein*
+%attr(755,root,root) %{_libdir}/%{name}/program/passwordcontainer.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/pluginapp.bin
 ## seems to be exactly the same as in -ure
-#%attr(755,root,root) %{basisdir}/program/regcomp
-#%attr(755,root,root) %{basisdir}/program/regcomp.bin
+#%attr(755,root,root) %{_libdir}/%{name}/program/regcomp
+#%attr(755,root,root) %{_libdir}/%{name}/program/regcomp.bin
 ##
-%attr(755,root,root) %{basisdir}/program/sax.uno.so
-%attr(755,root,root) %{basisdir}/program/senddoc
-%attr(755,root,root) %{basisdir}/program/simplecanvas.uno.so
-%attr(755,root,root) %{basisdir}/program/slideshow.uno.so
-%attr(755,root,root) %{basisdir}/program/spadmin.bin
-%attr(755,root,root) %{basisdir}/program/stringresource*.uno.so
-%attr(755,root,root) %{basisdir}/program/syssh.uno.so
-%attr(755,root,root) %{basisdir}/program/ucpexpand1.uno.so
-%attr(755,root,root) %{basisdir}/program/ucpext.uno.so
-%attr(755,root,root) %{basisdir}/program/ucptdoc1.uno.so
-%attr(755,root,root) %{basisdir}/program/updatefeed.uno.so
-%attr(755,root,root) %{basisdir}/program/uri-encode
-%attr(755,root,root) %{basisdir}/program/vbaevents*.uno.so
-%attr(755,root,root) %{basisdir}/program/vclcanvas.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/senddoc
+%attr(755,root,root) %{_libdir}/%{name}/program/simplecanvas.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/slideshow.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/spadmin.bin
+%attr(755,root,root) %{_libdir}/%{name}/program/stringresource*.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/syssh.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/ucpexpand1.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/ucpext.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/ucptdoc1.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/updatefeed.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/uri-encode
+%attr(755,root,root) %{_libdir}/%{name}/program/vbaevents*.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/vclcanvas.uno.so
 
 %if %{with java}
-%attr(755,root,root) %{basisdir}/program/libhsqldb.so
-%attr(755,root,root) %{basisdir}/program/libjdbcl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libofficebean.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libhsqldb.so
 %endif
 
 %if %{with mono}
-%attr(755,root,root) %{basisdir}/program/libcli_uno.so
-%attr(755,root,root) %{basisdir}/program/libcli_uno_glue.so
-%{basisdir}/program/cli_basetypes.dll
-%{basisdir}/program/cli_cppuhelper.dll
-%{basisdir}/program/cli_types.dll
-%{basisdir}/program/cli_uno_bridge.dll
-%{basisdir}/program/cli_ure.dll
+%attr(755,root,root) %{_libdir}/%{name}/program/libcli_uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcli_uno_glue.so
+%{_libdir}/%{name}/program/cli_basetypes.dll
+%{_libdir}/%{name}/program/cli_cppuhelper.dll
+%{_libdir}/%{name}/program/cli_types.dll
+%{_libdir}/%{name}/program/cli_uno_bridge.dll
+%{_libdir}/%{name}/program/cli_ure.dll
 %endif
 
-%{basisdir}/program/fundamentalbasisrc
-%{basisdir}/program/offapi.rdb
-%{basisdir}/program/oovbaapi.rdb
-%{basisdir}/program/root3.dat
-%{basisdir}/program/root4.dat
-%{basisdir}/program/root5.dat
-%{basisdir}/program/services.rdb
-%{_libdir}/%{name}/program/services.rdb
-%config(noreplace) %verify(not md5 mtime size) %{basisdir}/program/unorc
-%{basisdir}/program/versionrc
+%{_libdir}/%{name}/program/root3.dat
+%{_libdir}/%{name}/program/root4.dat
+%{_libdir}/%{name}/program/root5.dat
+%config(noreplace) %verify(not md5 mtime size) %{_libdir}/%{name}/program/unorc
+%{_libdir}/%{name}/program/versionrc
 
 %if %{with java}
-%dir %{basisdir}/program/classes
-%{basisdir}/program/classes/LuceneHelpWrapper.jar
-%{basisdir}/program/classes/ScriptFramework.jar
-%{basisdir}/program/classes/ScriptProviderForJava.jar
-%{basisdir}/program/classes/XMergeBridge.jar
-%{basisdir}/program/classes/XSLTFilter.jar
-%{basisdir}/program/classes/XSLTValidate.jar
-%{basisdir}/program/classes/agenda.jar
-%{basisdir}/program/classes/commonwizards.jar
-%{basisdir}/program/classes/fax.jar
-%{basisdir}/program/classes/form.jar
-%{!?with_system_hsqldb:%{basisdir}/program/classes/hsqldb.jar}
-%{basisdir}/program/classes/letter.jar
-%{basisdir}/program/classes/officebean.jar
-%{basisdir}/program/classes/query.jar
-%{basisdir}/program/classes/report.jar
-%{basisdir}/program/classes/saxon9.jar
-%{basisdir}/program/classes/sdbc_hsqldb.jar
-%{!?with_system_xalan:%{basisdir}/program/classes/serializer.jar}
-%{basisdir}/program/classes/table.jar
-%{basisdir}/program/classes/unoil.jar
-%{basisdir}/program/classes/web.jar
-%{!?with_system_xalan:%{basisdir}/program/classes/xalan.jar}
-%{basisdir}/program/classes/xmerge.jar
+%dir %{_libdir}/%{name}/program/classes
+%{_libdir}/%{name}/program/classes/LuceneHelpWrapper.jar
+%{_libdir}/%{name}/program/classes/ScriptFramework.jar
+%{_libdir}/%{name}/program/classes/ScriptProviderForJava.jar
+%{_libdir}/%{name}/program/classes/XMergeBridge.jar
+%{_libdir}/%{name}/program/classes/XSLTFilter.jar
+%{_libdir}/%{name}/program/classes/XSLTValidate.jar
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libreoffice/libreoffice.spec?r1=1.933&r2=1.934&f=u



More information about the pld-cvs-commit mailing list