packages: libreoffice/libreoffice.spec, libreoffice/libreoffice-poppler.pat...

Thu May 31 13:20:40 CEST 2012

Author: arekm                        Date: Thu May 31 11:20:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.5.4.2 (traditionally - tons of unpackaged files)

---- Files affected:
packages/libreoffice:
   libreoffice.spec (1.946 -> 1.947) , libreoffice-poppler.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.946 packages/libreoffice/libreoffice.spec:1.947

--- packages/libreoffice/libreoffice.spec:1.946	Mon May 28 23:00:26 2012
+++ packages/libreoffice/libreoffice.spec	Thu May 31 13:20:34 2012
@@ -44,13 +44,13 @@
 %undefine	with_system_hsqldb
 %endif
 
-%define		major_ver		3.5.3
+%define		major_ver		3.5.4
 
 Summary:	LibreOffice - powerful office suite
 Summary(pl.UTF-8):	LibreOffice - potężny pakiet biurowy
 Name:		libreoffice
 Version:	%{major_ver}.2
-Release:	4
+Release:	1
 License:	GPL/LGPL
 Group:		X11/Applications
 # we use git because released tarballs are buggy too often
@@ -58,15 +58,15 @@
 # cd build
 # git checkout -b libreoffice-3-3 origin/libreoffice-3-3
 Source0:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-core-%{version}.tar.xz
-# Source0-md5:	d22cd79e7463ac4caf0a4b47d78a82ac
+# Source0-md5:	61afc900785dd7d071b96d9ab0af46f3
 Source1:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-binfilter-%{version}.tar.xz
-# Source1-md5:	d8c5da3f1f298d2ac35444f9dc4ce8f2
+# Source1-md5:	e0ea910f2a6fbe1dbe44e437c89b8cd7
 Source2:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source2-md5:	f4ebfe04dc035dd075709a3f6cb76284
+# Source2-md5:	f5b21e92bebabffe634aabb4e36cdd87
 Source3:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source3-md5:	3455f3f523d739aa391b5a5bf04ff958
+# Source3-md5:	d2e7414a60eacafef45fbc4bc1a8ccb3
 Source4:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source4-md5:	945fbf7888c464f4e1cf7282d370b257
+# Source4-md5:	545d1608da2cc736be5c8bf941adbbfb
 
 Source20:	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 # Source20-md5:	185d60944ea767075d27247c3162b3bc
@@ -87,8 +87,7 @@
 Source30:	http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 # Source30-md5:	17410483b5b5f267aa18b7e00b65e6e0
 Patch0:		%{name}-hamcrest.patch
-Patch1:		%{name}-poppler.patch
-Patch2:		%{name}-libexttextcat.patch
+Patch1:		%{name}-libexttextcat.patch
 URL:		http://www.documentfoundation.org/
 BuildRequires:	/usr/bin/getopt
 BuildRequires:	GConf2-devel
@@ -2430,7 +2429,6 @@
 
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
 
 for dir in *-%{version}; do
 	[ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
@@ -3161,7 +3159,7 @@
 %if %{with java}
 %attr(755,root,root) %{_libdir}/%{name}/program/libhsqldb.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libjdbclo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libofficebeanlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libofficebean.so
 %endif
 
 %if %{with mono}
@@ -3710,7 +3708,6 @@
 %attr(755,root,root) %{_libdir}/%{name}/share/extensions/pdfimport/xpdfimport
 %{_libdir}/%{name}/share/extensions/pdfimport/META-INF
 %{_libdir}/%{name}/share/extensions/pdfimport/basic
-%{_libdir}/%{name}/share/extensions/pdfimport/description-en-US.txt
 %{_libdir}/%{name}/share/extensions/pdfimport/description.xml
 %{_libdir}/%{name}/share/extensions/pdfimport/images
 %{_libdir}/%{name}/share/extensions/pdfimport/registration
@@ -3723,7 +3720,6 @@
 %attr(755,root,root) %{_libdir}/%{name}/share/extensions/presentation-minimizer/SunPresentationMinimizer.uno.so
 %{_libdir}/%{name}/share/extensions/presentation-minimizer/META-INF
 %{_libdir}/%{name}/share/extensions/presentation-minimizer/bitmaps
-%{_libdir}/%{name}/share/extensions/presentation-minimizer/description-en-US.txt
 %{_libdir}/%{name}/share/extensions/presentation-minimizer/description.xml
 %{_libdir}/%{name}/share/extensions/presentation-minimizer/registr*
 
@@ -3733,7 +3729,6 @@
 %attr(755,root,root) %{_libdir}/%{name}/share/extensions/presenter-screen/PresenterScreen.uno.so
 %{_libdir}/%{name}/share/extensions/presenter-screen/META-INF
 %{_libdir}/%{name}/share/extensions/presenter-screen/bitmaps
-%{_libdir}/%{name}/share/extensions/presenter-screen/description-en-US.txt
 %{_libdir}/%{name}/share/extensions/presenter-screen/description.xml
 %{_libdir}/%{name}/share/extensions/presenter-screen/help
 %{_libdir}/%{name}/share/extensions/presenter-screen/registry
@@ -3748,7 +3743,6 @@
 %{_libdir}/%{name}/share/extensions/report-builder/template
 %{_libdir}/%{name}/share/extensions/report-builder/THIRDPARTYREADMELICENSE.html
 %{_libdir}/%{name}/share/extensions/report-builder/components.rdb
-%{_libdir}/%{name}/share/extensions/report-builder/description-en-US.txt
 %{_libdir}/%{name}/share/extensions/report-builder/description.xml
 %{_libdir}/%{name}/share/extensions/report-builder/readme*
 %{_libdir}/%{name}/share/extensions/report-builder/*.jar
@@ -3765,7 +3759,6 @@
 %{_libdir}/%{name}/share/extensions/wiki-publisher/templates
 %{_libdir}/%{name}/share/extensions/wiki-publisher/*.xc*
 %{_libdir}/%{name}/share/extensions/wiki-publisher/components.rdb
-%{_libdir}/%{name}/share/extensions/wiki-publisher/description-en-US.txt
 %{_libdir}/%{name}/share/extensions/wiki-publisher/description.xml
 %{_libdir}/%{name}/share/extensions/wiki-publisher/mediawiki.jar
 
@@ -4101,6 +4094,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.947  2012/05/31 11:20:34  arekm
+- up to 3.5.4.2 (traditionally - tons of unpackaged files)
+
 Revision 1.946  2012/05/28 21:00:26  arekm
 - rel 4; fix from upstream for new libexttextcat
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/libreoffice/libreoffice.spec?r1=1.946&r2=1.947

