packages: libreoffice/libreoffice.spec - adapter, java pkgs names

[glen]

Author: glen                         Date: Fri Oct 21 22:34:45 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adapter, java pkgs names

---- Files affected:
packages/libreoffice:
   libreoffice.spec (1.902 -> 1.903) 

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.902 packages/libreoffice/libreoffice.spec:1.903
--- packages/libreoffice/libreoffice.spec:1.902	Fri Oct 21 20:48:04 2011
+++ packages/libreoffice/libreoffice.spec	Sat Oct 22 00:34:39 2011
@@ -186,8 +186,8 @@
 BuildRequires:	gstreamer-devel >= 0.10.0
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10.0
 BuildRequires:	gtk+2-devel >= 2:2.10
-BuildRequires:	hyphen-devel
 %{?with_system_hunspell:BuildRequires:	hunspell-devel >=1.2.2}
+BuildRequires:	hyphen-devel
 %{?with_icecream:BuildRequires:	icecream}
 BuildRequires:	icu
 %{?with_system_beanshell:BuildRequires:	java-beanshell}
@@ -212,6 +212,8 @@
 BuildRequires:	kde4-kdelibs-devel
 BuildRequires:	qt4-build
 %endif
+BuildRequires:	java-libxml
+BuildRequires:	java-sac
 BuildRequires:	libart_lgpl-devel
 BuildRequires:	libbonobo-devel >= 2.0
 %{?with_system_libhnj:BuildRequires:	libhnj-devel}
@@ -237,7 +239,6 @@
 BuildRequires:	openldap-devel
 BuildRequires:	pam-devel
 BuildRequires:	pango-devel >= 1:1.17.3
-BuildRequires:	java-pentaho-libxml
 BuildRequires:	perl-Archive-Zip
 BuildRequires:	perl-base
 BuildRequires:	perl-devel
@@ -252,7 +253,6 @@
 BuildRequires:	rpmbuild(macros) >= 1.357
 BuildRequires:	sablotron-devel
 BuildRequires:	sane-backends-devel
-BuildRequires:	java-sac
 BuildRequires:	saxon
 BuildRequires:	sed >= 4.0
 BuildRequires:	startup-notification-devel >= 0.5
@@ -2725,7 +2725,7 @@
 	rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
 
 	%if %{with mono}
-	rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/mono-ooo-2.1.pc
+	rm $RPM_BUILD_ROOT%{_pkgconfigdir}/mono-ooo-2.1.pc
 	%endif
 
 	%if %{with mozilla}
@@ -2755,7 +2755,7 @@
 
 	# Make oo* -> lo* symlinks for compatibility with misc software,
 	# for example mailcap
-	ln -s libreoffice $RPM_BUILD_ROOT%{_bindir}/ooffice 
+	ln -s libreoffice $RPM_BUILD_ROOT%{_bindir}/ooffice
 	for a in fromtemplate base calc draw writer impress math web; do
 		ln -s lo$a $RPM_BUILD_ROOT%{_bindir}/oo$a
 	done
@@ -4162,6 +4162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.903  2011/10/21 22:34:39  glen
+- adapter, java pkgs names
+
 Revision 1.902  2011/10/21 18:48:04  arekm
 - rename java BR
 
================================================================

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