- Add conditional for noarch subpackages

- Add switch in configure to detect more of internal/external stuff

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

libreoffice.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 15 11:56:26 UTC 2015 - tchvatal@suse.com
+
+- Add conditional for noarch subpackages
+- Add switch in configure to detect more of internal/external stuff
+
 -------------------------------------------------------------------
 Wed Apr 15 11:42:37 UTC 2015 - tchvatal@suse.com
 

libreoffice.spec

@@ -16,17 +16,30 @@
 #
 
 
+# Applications datastore
 %if 0%{?suse_version} > 1315
 %bcond_without appdatastore
 %else
 %bcond_with appdatastore
 %endif
+# GTK3 and gstreamer switch
+%if 0%{?suse_version} > 1230
+%bcond_without newmedia
+%else
+%bcond_with newmedia
+%endif
+# Wether to use internal libs or rely on system ones
 %if 0%{?suse_version} > 1230
 %bcond_without systemlibs
 %else
 %bcond_with systemlibs
 %endif
-
+# Wether to provide noarch subpackages
+%if 0%{?suse_version} > 1130
+%bcond_without noarch_subpkgs
+%else
+%bcond_with noarch_subpkgs
+%endif
 # List of supported langs, populated bellow in the lang macros
 %global         langpack_langs    %{nil}
 # extensions
@@ -274,8 +287,10 @@ License:        Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause an
 Group:          Productivity/Office/Suite
 Supplements:    packageand(libreoffice:branding-upstream)
 Provides:       libreoffice-branding = %{version}
-BuildArch:      noarch
 Conflicts:      otherproviders(libreoffice-branding)
+%if %{with noarch_subpkgs}
+BuildArch:      noarch
+%endif
 
 %description branding-upstream
 This package includes the original branding for the LibreOffice office suite.
@@ -288,7 +303,9 @@ Requires(post): %{name} = %{version}
 Requires(postun): %{name} = %{version}
 Provides:       libreoffice-icon-themes = %{version}
 Obsoletes:      libreoffice-icon-themes < %{version}
+%if %{with noarch_subpkgs}
 BuildArch:      noarch
+%endif
 
 %description icon-theme-crystal
 This package provides Crystal LibreOffice icon theme. It is used in KDE3 by default.
@@ -302,7 +319,9 @@ Requires(post): %{name} = %{version}
 Requires(postun): %{name} = %{version}
 Provides:       libreoffice-icon-themes = %{version}
 Obsoletes:      libreoffice-icon-themes < %{version}
+%if %{with noarch_subpkgs}
 BuildArch:      noarch
+%endif
 
 %description icon-theme-galaxy
 This package provides Galaxy LibreOffice icon theme. It is used in the original OOo-3.x by default.
@@ -316,7 +335,9 @@ Requires(post): %{name} = %{version}
 Requires(postun): %{name} = %{version}
 Provides:       libreoffice-icon-themes = %{version}
 Obsoletes:      libreoffice-icon-themes < %{version}
+%if %{with noarch_subpkgs}
 BuildArch:      noarch
+%endif
 
 %description icon-theme-hicontrast
 This package provides Hicontrast LibreOffice icon theme.
@@ -330,7 +351,9 @@ Requires(post): %{name} = %{version}
 Requires(postun): %{name} = %{version}
 Provides:       libreoffice-icon-themes = %{version}
 Obsoletes:      libreoffice-icon-themes < %{version}
+%if %{with noarch_subpkgs}
 BuildArch:      noarch
+%endif
 
 %description icon-theme-oxygen
 This package provides Oxygen LibreOffice icon theme. It is used in KDE4 by default.
@@ -344,7 +367,9 @@ Requires(post): %{name} = %{version}
 Requires(postun): %{name} = %{version}
 Provides:       libreoffice-icon-themes = %{version}
 Obsoletes:      libreoffice-icon-themes < %{version}
+%if %{with noarch_subpkgs}
 BuildArch:      noarch
+%endif
 
 %description icon-theme-sifr
 This package provides Sifr LibreOffice icon theme.
@@ -358,7 +383,9 @@ Requires(post): %{name} = %{version}
 Requires(postun): %{name} = %{version}
 Provides:       libreoffice-icon-themes = %{version}
 Obsoletes:      libreoffice-icon-themes < %{version}
+%if %{with noarch_subpkgs}
 BuildArch:      noarch
+%endif
 
 %description icon-theme-tango
 This package provides Tango LibreOffice icon theme. It is used in GNOME by default
@@ -729,7 +756,9 @@ Requires:       %{name} = %{version} \
 Requires(post,): %{name} = %{version} \
 Requires(postun,): %{name} = %{version} \
 Provides:       locale(libreoffice:%{lang}) \
+%if %{with noarch_subpkgs} \
 BuildArch:      noarch \
+%endif \
 %{-m:Requires: myspell-%{-m*}}%{!-m:%{-M:Requires: myspell-%{lang}}} \
 %{-r:Requires: %{-r*}} \
 %{-p:Provides: %{name}-l10n-%{-p*}} \
@@ -913,8 +942,14 @@ export NOCONFIGURE=yes
         --docdir=%{_docdir}/%{name} \
         --with-compat-oowrappers \
         --with-system-headers \
+%if %{with systemlibs}
         --with-system-libs \
         --with-system-jars \
+        --with-system-ucpp \
+%else
+        --without-system-libs \
+        --without-system-jars \
+%endif
         --with-system-dicts \
         --with-vendor=SUSE \
         --with-alloc=system \
@@ -923,11 +958,19 @@ export NOCONFIGURE=yes
         --with-external-tar="$RPM_SOURCE_DIR" \
         --disable-epm \
         --disable-gnome-vfs \
-        --disable-gstreamer-0-10 \
         --disable-kdeab \
         --disable-kde \
         --disable-online-update \
         --disable-systray \
+%if %{with newmedia}
+        --disable-gstreamer-0-10 \
+        --enable-gstreamer-1-0 \
+        --disable-gtk3 \
+%else
+        --enable-gstreamer-0-10 \
+        --disable-gstreamer-1-0 \
+        --enable-gtk3 \
+%endif
         --enable-release-build \
         --enable-split-app-modules \
         --enable-split-opt-features \
@@ -948,9 +991,7 @@ export NOCONFIGURE=yes
         --with-help \
         --enable-odk \
         --with-doxygen \
-        --enable-gtk3 \
         --enable-kde4 \
-        --enable-gstreamer-1-0 \
         --enable-evolution2 \
         --enable-lockdown \
         --enable-dbus \
@@ -964,9 +1005,8 @@ export NOCONFIGURE=yes
         --enable-scripting-javascript \
         --disable-vlc \
         --enable-neon \
-        --with-system-ucpp \
         --disable-ccache \
-        --enable-gltf --with-system-libgltf \
+        --enable-gltf \
         --disable-coinmp \
         --disable-collada \
         --enable-symbols