- Remove vlc conditional

- korea.xcd is no more so remove
- Really use mergelib

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

libreoffice.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan  5 15:08:25 UTC 2015 - tchvatal@suse.com
+
+- Remove vlc conditional
+- korea.xcd is no more so remove
+- Really use mergelib
+
 -------------------------------------------------------------------
 Mon Jan  5 12:23:43 UTC 2015 - tchvatal@suse.com
 

libreoffice.spec

@@ -16,12 +16,6 @@
 #
 
 
-# vlc is only on 13.1 and later and not for SLE
-%if 0%{?suse_version} < 1310
-%bcond_with vlc
-%else
-%bcond_without vlc
-%endif
 # List of supported langs, populated bellow in the lang macros
 %global         langpack_langs    %{nil}
 # extensions
@@ -197,6 +191,7 @@ BuildRequires:  ucpp
 BuildRequires:  unixODBC-devel
 BuildRequires:  unzip
 BuildRequires:  vigra-devel
+BuildRequires:  vlc-devel
 BuildRequires:  xml-commons-apis
 BuildRequires:  xorg-x11
 BuildRequires:  xorg-x11-fonts
@@ -231,9 +226,6 @@ Provides:       %{name}-ure = %{version}
 Obsoletes:      %{name}-ure < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{arm} %{ix86} x86_64 ppc ppc64
-%if %{with vlc}
-BuildRequires:  vlc-devel
-%endif
 # we need a JRE for oobase and the other stuff
 %ifarch %{ix86}
 Recommends:     jre-32 >= 1.6
@@ -803,7 +795,7 @@ Provides additional %{langname} translations and resources for %{project}. \
 %langpack -l ja -n Japanese -s cjk -T -X
 %langpack -l kk -n Kazakh
 %langpack -l kn -n Kannada
-%langpack -l ko -n Korean -s cjk -T -c korea -X
+%langpack -l ko -n Korean -s cjk -T -X
 %langpack -l lt -n Lithuanian -m lt_LT -X
 %langpack -l lv -n Latvian -m lv_LV
 %langpack -l mai -n Maithili
@@ -932,6 +924,7 @@ export NOCONFIGURE=yes
 ./autogen.sh
 %configure \
         $PARALLEL_BUILD \
+        --enable-verbose \
         --enable-mergelibs \
         --docdir=%{_docdir}/%{name} \
         --with-compat-oowrappers \
@@ -954,7 +947,6 @@ export NOCONFIGURE=yes
         --enable-release-build \
         --enable-split-app-modules \
         --enable-split-opt-features \
-        --disable-mergelibs \
         --enable-cairo-canvas \
         --enable-graphite \
         --enable-largefile \
@@ -986,9 +978,7 @@ export NOCONFIGURE=yes
         --enable-ext-mariadb-connector \
         --enable-scripting-beanshell \
         --enable-scripting-javascript \
-%if %{with vlc}
         --enable-vlc \
-%endif
         --enable-neon \
         --with-system-ucpp \
         --disable-ccache \
@@ -1067,7 +1057,7 @@ for i in %{buildroot}%{_libdir}/%{name}/share/config/soffice.cfg/modules/*/ui/re
          %{buildroot}%{_libdir}/%{name}/program/resource/*.res \
          %{buildroot}%{_libdir}/%{name}/share/config/images*.zip \
          %{buildroot}%{_libdir}/%{name}/share/registry/{cjk,ctl}_*.xcd \
-	 %{buildroot}%{_libdir}/%{name}/share/registry/{korea,ctlseqcheck_th}.xcd \
+	 %{buildroot}%{_libdir}/%{name}/share/registry/ctlseqcheck_th.xcd \
         ; do
     trg="`dirname "$i" | sed 's|%{_libdir}|%{_datadir}|'`"
     mkdir -p "$trg"