- Reorder deps to be alphabetic again.

- Explicitely want fbclient pkgconfig to be around.

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=93

libreoffice.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Jan 26 16:41:10 UTC 2014 - tchvatal@suse.com
+
+- Reorder deps to be alphabetic again.
+
+-------------------------------------------------------------------
+Sun Jan 26 16:35:24 UTC 2014 - tchvatal@suse.com
+
+- Explicitely want fbclient pkgconfig to be around.
+
 -------------------------------------------------------------------
 Sun Jan 26 10:35:11 UTC 2014 - tchvatal@suse.com
 

libreoffice.spec

@@ -53,17 +53,6 @@ Source452:      %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.t
 # gdocs sources
 Source500:      gdocs_3.0.0.tar.bz2
 Source501:      gdocs_3.0.0.diff
-BuildRequires:  flute
-BuildRequires:  libbase
-BuildRequires:  libfonts
-BuildRequires:  libformula
-BuildRequires:  liblayout
-BuildRequires:  libloader
-BuildRequires:  librepository
-BuildRequires:  libserializer
-BuildRequires:  pentaho-libxml
-BuildRequires:  pentaho-reporting-flow-engine
-BuildRequires:  sac
 # Internal bundled stuff we can't remove
 # XMLSec is patched over and over in here
 Source2000:     %{external_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
@@ -126,6 +115,7 @@ BuildRequires:  doxygen >= 1.8.4
 BuildRequires:  fdupes
 BuildRequires:  flac-devel
 BuildRequires:  flex
+BuildRequires:  flute
 BuildRequires:  gcc-c++
 BuildRequires:  glu-devel
 BuildRequires:  gnome-vfs2-devel
@@ -143,6 +133,7 @@ BuildRequires:  junit4
 BuildRequires:  krb5
 BuildRequires:  krb5-devel
 BuildRequires:  libabw-devel
+BuildRequires:  libbase
 BuildRequires:  libcdr-devel
 BuildRequires:  libcmis-devel
 BuildRequires:  libcppunit-devel
@@ -154,11 +145,15 @@ BuildRequires:  libexif
 BuildRequires:  libexpat-devel
 BuildRequires:  libexttextcat-devel
 BuildRequires:  libfbembed-devel
+BuildRequires:  libfonts
+BuildRequires:  libformula
 BuildRequires:  libfreehand-devel
 BuildRequires:  libicu-devel
 BuildRequires:  libkde4-devel
 BuildRequires:  liblangtag-devel
+BuildRequires:  liblayout
 BuildRequires:  liblcms2-devel
+BuildRequires:  libloader
 BuildRequires:  libmspub-devel
 BuildRequires:  libmwaw-devel
 BuildRequires:  libmysqlclient-devel
@@ -167,7 +162,9 @@ BuildRequires:  libodfgen-devel
 BuildRequires:  liborcus-devel >= 0.5.0
 BuildRequires:  libpoppler-devel
 BuildRequires:  libredland-devel
+BuildRequires:  librepository
 BuildRequires:  librsvg-devel
+BuildRequires:  libserializer
 BuildRequires:  libtool
 BuildRequires:  libvisio-devel
 BuildRequires:  libwpd-devel
@@ -185,6 +182,8 @@ BuildRequires:  npapi-sdk
 BuildRequires:  openldap2-devel
 BuildRequires:  pam-devel
 BuildRequires:  patch
+BuildRequires:  pentaho-libxml
+BuildRequires:  pentaho-reporting-flow-engine
 BuildRequires:  perl-Archive-Zip
 BuildRequires:  perl-Compress-Zlib
 BuildRequires:  postgresql-devel
@@ -194,22 +193,19 @@ BuildRequires:  python-lxml
 BuildRequires:  python-xml
 BuildRequires:  recode
 BuildRequires:  rhino
+BuildRequires:  sac
 BuildRequires:  sane-backends-devel
 BuildRequires:  telepathy-glib-devel
 BuildRequires:  ucpp
 BuildRequires:  unixODBC-devel
 BuildRequires:  unzip
 BuildRequires:  vigra-devel
-# vlc is only on 13.1 and later
-# Drop this condition when 12.3 is out of support
-%if 0%{?suse_version} > 01230
-BuildRequires:  vlc-devel
-%endif
 BuildRequires:  xml-commons-apis
 BuildRequires:  xorg-x11
 BuildRequires:  xorg-x11-fonts
 BuildRequires:  xz
 BuildRequires:  zip
+BuildRequires:  pkgconfig(fbclient)
 Requires:       libreoffice-branding >= 4.0
 Requires:       libreoffice-icon-themes = %{version}
 Requires(post): coreutils
@@ -236,6 +232,11 @@ Provides:       %{name}-l10n-prebuild = %{version}
 Obsoletes:      %{name}-l10n-prebuild < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{arm} %{ix86} x86_64 ppc ppc64
+# vlc is only on 13.1 and later
+# Drop this condition when 12.3 is out of support
+%if 0%{?suse_version} > 01230
+BuildRequires:  vlc-devel
+%endif
 # we need a JRE for oobase and the other stuff
 %ifarch %{ix86}
 Recommends:     jre-32 >= 1.6
@@ -526,8 +527,8 @@ The documentation is in the package libreoffice-sdk-doc
 Summary:        LibreOffice SDK Documentation
 License:        LGPL-3.0
 Group:          Development/Libraries/Other
-BuildArch:      noarch
 Suggests:       %{name}-sdk = %{version}
+BuildArch:      noarch
 Enhances:       %{name}-sdk = %{version}
 
 %description sdk-doc