- Parse over with spec-cleaner to remove few obsolete declarations

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

libreoffice.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 11 09:24:28 UTC 2017 - tchvatal@suse.com
+
+- Parse over with spec-cleaner to remove few obsolete declarations
+
 -------------------------------------------------------------------
 Fri Aug  4 19:16:58 UTC 2017 - mgorse@suse.com
 

libreoffice.spec

@@ -22,8 +22,8 @@
 %define         numbertext_version 0.9.5
 # Urls
 %define         external_url       http://dev-www.libreoffice.org/src/
-#%define         tarball_url        http://download.documentfoundation.org/libreoffice/src/5.4.0
+%define         tarball_url        http://download.documentfoundation.org/libreoffice/src/5.4.0
-%define         tarball_url        http://dev-builds.libreoffice.org/pre-releases/src/
+#%define         tarball_url        http://dev-builds.libreoffice.org/pre-releases/src/
 # Wether to enable the kde integration
 %if 0%{?is_opensuse}
 %bcond_without kdeintegration
@@ -39,7 +39,7 @@ Name:           libreoffice
 Version:        5.4.0.3
 Release:        0
 Summary:        A Free Office Suite (Framework)
-License:        LGPL-3.0+ and MPL-2.0+
+License:        LGPL-3.0+ AND MPL-2.0+
 Group:          Productivity/Office/Suite
 Url:            http://www.documentfoundation.org/
 Source0:        %{tarball_url}/libreoffice-%{version}.tar.xz
@@ -88,14 +88,6 @@ BuildRequires:  %{name}-share-linker
 BuildRequires:  ant
 BuildRequires:  autoconf
 BuildRequires:  bison
-%if 0%{?suse_version} > 1325
-BuildRequires:  libboost_date_time-devel
-BuildRequires:  libboost_filesystem-devel
-BuildRequires:  libboost_iostreams-devel
-BuildRequires:  libboost_system-devel
-%else
-BuildRequires:  boost-devel
-%endif
 BuildRequires:  bsh2
 BuildRequires:  commons-codec
 BuildRequires:  commons-httpclient
@@ -103,6 +95,8 @@ BuildRequires:  commons-lang
 BuildRequires:  commons-logging
 BuildRequires:  cups-devel
 BuildRequires:  curl-devel
+# Needed for tests
+BuildRequires:  dejavu-fonts
 BuildRequires:  doxygen >= 1.8.4
 BuildRequires:  fdupes
 BuildRequires:  flex
@@ -110,29 +104,19 @@ BuildRequires:  flute
 BuildRequires:  gcc-c++
 BuildRequires:  glm-devel
 # Needed for tests
-BuildRequires:  dejavu-fonts
-# Needed for tests
 BuildRequires:  google-carlito-fonts
 BuildRequires:  gperf
 BuildRequires:  hyphen-devel
-BuildRequires:  libgpgmepp-devel
 # genbrk binary is required
 BuildRequires:  icu
 BuildRequires:  java-devel >= 1.6
 BuildRequires:  junit4
 BuildRequires:  libbase
 BuildRequires:  libcppunit-devel >= 1.14.0
-%if 0%{?suse_version} >= 1330
-BuildRequires:  liberation2-fonts
-%else
-BuildRequires:  liberation-fonts
-%endif
 BuildRequires:  libexif
-%if %{with firebird}
-BuildRequires:  pkgconfig(fbclient)
-%endif
 BuildRequires:  libfonts
 BuildRequires:  libformula
+BuildRequires:  libgpgmepp-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  liblayout
 BuildRequires:  libloader
@@ -144,11 +128,6 @@ BuildRequires:  libtool
 BuildRequires:  lpsolve-devel
 BuildRequires:  make
 BuildRequires:  neon-devel >= 0.26.0
-%if %{suse_version} == 1315
-BuildRequires:  openCOLLADA-devel
-%else
-BuildRequires:  libopenCOLLADA-devel
-%endif
 BuildRequires:  openldap2-devel
 BuildRequires:  pentaho-libxml
 BuildRequires:  pentaho-reporting-flow-engine
@@ -233,11 +212,6 @@ Requires(post): update-desktop-files
 Requires(postun): update-desktop-files
 Recommends:     dejavu-fonts
 Recommends:     google-carlito-fonts
-%if 0%{?suse_version} >= 1330
-Recommends:     liberation2-fonts
-%else
-Recommends:     liberation-fonts
-%endif
 Provides:       %{name}-draw-extensions = %{version}
 Obsoletes:      %{name}-draw-extensions < %{version}
 Provides:       %{name}-impress-extensions = %{version}
@@ -256,8 +230,30 @@ Provides:       %{name}-icon-theme-crystal = %{version}
 Obsoletes:      %{name}-icon-theme-crystal < %{version}
 Provides:       %{name}-icon-theme-oxygen = %{version}
 Obsoletes:      %{name}-icon-theme-oxygen < %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+ExclusiveArch:  %{arm} aarch64 %{ix86} x86_64 ppc ppc64 ppc64le s390x
-ExclusiveArch:  %arm aarch64 %ix86 x86_64 ppc ppc64 ppc64le s390x
+%if 0%{?suse_version} > 1325
+BuildRequires:  libboost_date_time-devel
+BuildRequires:  libboost_filesystem-devel
+BuildRequires:  libboost_iostreams-devel
+BuildRequires:  libboost_system-devel
+%else
+BuildRequires:  boost-devel
+%endif
+%if 0%{?suse_version} >= 1330
+BuildRequires:  liberation2-fonts
+Recommends:     liberation2-fonts
+%else
+BuildRequires:  liberation-fonts
+Recommends:     liberation-fonts
+%endif
+%if %{with firebird}
+BuildRequires:  pkgconfig(fbclient)
+%endif
+%if 0%{?suse_version} == 1315
+BuildRequires:  openCOLLADA-devel
+%else
+BuildRequires:  libopenCOLLADA-devel
+%endif
 %if %{with kdeintegration}
 BuildRequires:  libkde4-devel
 %else
@@ -405,7 +401,7 @@ Group:          Productivity/Office/Suite
 Requires:       %{name} = %{version}
 Requires:       pentaho-reporting-flow-engine
 Supplements:    %{name}
-%ifarch %arm %ix86 ppc
+%ifarch %{arm} %{ix86} ppc
 Requires:       jre-32 >= 1.6
 %endif
 %ifarch x86_64 aarch64 ppc64 ppc64le s390x
@@ -592,7 +588,7 @@ Software Development Kit (SDK).
 Summary:        OfficeBean Java Bean component for LibreOffice
 Group:          Productivity/Office/Suite
 Requires:       %{name} = %{version}
-%ifarch %arm %ix86 ppc
+%ifarch %{arm} %{ix86} ppc
 Requires:       jre-32 >= 1.6
 %endif
 %ifarch x86_64 aarch64 ppc64 ppc64le s390x
@@ -636,7 +632,7 @@ Requires:       libreoffice-calc = %{version}
 Requires:       libreoffice-pyuno = %{version}
 Requires(pre):  libreoffice = %{version}
 # the watchWindow extension is written in java
-%ifarch %arm %ix86 ppc
+%ifarch %{arm} %{ix86} ppc
 Requires:       jre-32 >= 1.6
 %endif
 %ifarch x86_64 aarch64 ppc64 ppc64le s390x
@@ -656,7 +652,7 @@ Group:          Productivity/Office/Suite
 Requires:       libreoffice-writer = %{version}
 Requires(pre):  libreoffice = %{version}
 # the wiki extension is written in java
-%ifarch %arm %ix86 ppc
+%ifarch %{arm} %{ix86} ppc
 Requires:       jre-32 >= 1.6
 %endif
 %ifarch x86_64 aarch64 ppc64 ppc64le s390x
@@ -819,7 +815,6 @@ Obsoletes:      %{name}-help-%{-q*} < %{version} \
 Provides additional %{langname} translations and resources for %{project}. \
 \
 %files %{pkgname} \
-%defattr(-,root,root) \
 %{!-E: \
 %define autotextdir %{_datadir}/%{name}/share/autotext \
 %dir %{autotextdir} \
@@ -922,7 +917,7 @@ echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile
 %build
 # Parallel build settings ...
 lo_jobs="%{?jobs:%{jobs}}"
-%ifarch %arm
+%ifarch %{arm}
     %if ! 0%{?qemu_user_space_build:1}
         # native hardware is not that powerful
         lo_jobs="1"
@@ -946,7 +941,7 @@ PARALLEL_BUILD=
 if test -n "$lo_jobs" ; then
   PARALLEL_BUILD="--with-parallelism=$lo_jobs"
 fi
-# make sure that JAVA_HOME is set correctly
+# make %{?_smp_mflags} sure that JAVA_HOME is set correctly
 source %{_sysconfdir}/profile.d/alljava.sh
 # use RPM_OPT_FLAGS, ...
 # remove big debugsymbols as we simply consume too much space
@@ -1044,20 +1039,20 @@ export NOCONFIGURE=yes
         --with-gdrive-client-id="${google_default_client_id}"
 # no coinormp packages for coinmp
 
-# just call make here as we added the jobs in configure
+# just call make %{?_smp_mflags} here as we added the jobs in configure
 # The check phase is run here too if it is split with nocheck
 # install of jars get broken sometimes
-make verbose=true build-nocheck
+make %{?_smp_mflags} verbose=true build-nocheck
 
 %check
 # Run tests only on 64b intel as they are resource hogs
 %ifarch x86_64
-make
+make %{?_smp_mflags}
 unset WITH_LANG
 # work around flawed accessibility check
 export JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1"
 export OOO_TEST_SOFFICE=path:%{buildroot}%{baseinstdir}/program/soffice
-#timeout -k 2m 2h make smoketest.subsequentcheck
+#timeout -k 2m 2h make %{?_smp_mflags} smoketest.subsequentcheck
 # we don't need this anymore
 rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
 %endif
@@ -1332,7 +1327,6 @@ exit 0
 %_link_noarch_files icon-theme-tango
 
 %files -f file-lists/common_list.txt
-%defattr(-,root,root)
 # ignore helper files for brp-symlink check
 %exclude %{_datadir}/%{name}/program/sofficerc
 %exclude %{_datadir}/%{name}/program/flat_logo.svg
@@ -1353,7 +1347,6 @@ exit 0
 %dir %{_datadir}/icons/locolor/32x32/mimetypes
 
 %files -n libreofficekit
-%defattr(-,root,root)
 %dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/LOKDocView-0.1.typelib
 %{_libdir}/liblibreofficekitgtk.so
@@ -1363,14 +1356,12 @@ exit 0
 %{_libdir}/libreoffice/share/libreofficekit/handle_image_start.png
 
 %files -n libreofficekit-devel
-%defattr(-,root,root)
 %dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/LOKDocView-0.1.gir
 %dir %{_includedir}/LibreOfficeKit
 %{_includedir}/LibreOfficeKit/*.h
 
 %files glade
-%defattr(-,root,root)
 %dir %{_datadir}/glade
 %dir %{_datadir}/glade/catalogs
 %{_datadir}/glade/catalogs/libreoffice-catalog.xml
@@ -1379,84 +1370,62 @@ exit 0
 %{_datadir}/glade3/catalogs/libreoffice-catalog.xml
 
 %files gdb-pretty-printers
-%defattr(-,root,root)
 %{_datadir}/gdb/auto-load/%{_libdir}/%{name}
 %{_datadir}/libreoffice/gdb
 
 %files -f file-lists/base_list.txt base
-%defattr(-,root,root)
 
 %files -f file-lists/calc_list.txt calc
-%defattr(-,root,root)
 
 %files -f file-lists/draw_list.txt draw
-%defattr(-,root,root)
 
 %files -f file-lists/math_list.txt math
-%defattr(-,root,root)
 
 %files -f file-lists/impress_list.txt impress
-%defattr(-,root,root)
 
 %files -f file-lists/writer_list.txt writer
-%defattr(-,root,root)
 
 %files -f file-lists/postgresql_list.txt base-drivers-postgresql
-%defattr(-,root,root)
 
 %if %{with firebird}
 %files base-drivers-firebird
-%defattr(-,root,root)
 %{_libdir}/libreoffice/program/libfirebird_sdbclo.so
 %endif
 
 %files -f file-lists/filters_list.txt filters-optional
-%defattr(-,root,root)
 
 %files -f file-lists/mailmerge_list.txt mailmerge
-%defattr(-,root,root)
 
 %files -f file-lists/pyuno_list.txt pyuno
-%defattr(-,root,root)
 
 %files -f file-lists/gnome_list.txt gnome
-%defattr(-,root,root)
 
 %files gtk3
-%defattr(-,root,root)
 %{_libdir}/libreoffice/program/libvclplug_gtk3lo.so
 
 %if %{with kdeintegration}
 %files -f file-lists/kde4_list.txt kde4
-%defattr(-,root,root)
 %endif
 
 %files -f file-lists/officebean_list.txt officebean
-%defattr(-,root,root)
 
 %files -f file-lists/sdk_list.txt sdk
-%defattr(-,root,root)
 %dir %{_libdir}/libreoffice/sdk/lib
 
 %files -f file-lists/sdk_doc_list.txt sdk-doc
-%defattr(-,root,root)
 
 %files base-drivers-mysql
-%defattr(-,root,root)
 %{_libdir}/%{name}/share/extensions/mysql-connector-ooo
 
 %files calc-extensions
-%defattr(-,root,root)
 %{_libdir}/%{name}/share/extensions/ConvertTextToNumber
 %{_libdir}/%{name}/share/extensions/nlpsolver
 %{_libdir}/%{name}/share/extensions/numbertext
 
 %files writer-extensions
-%defattr(-,root,root)
 %{_libdir}/%{name}/share/extensions/wiki-publisher
 
 %files icon-theme-breeze
-%defattr(-,root,root)
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/share
 %dir %{_datadir}/%{name}/share/config
@@ -1464,21 +1433,18 @@ exit 0
 %{_datadir}/%{name}/share/config/images_breeze_dark.zip
 
 %files icon-theme-galaxy
-%defattr(-,root,root)
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/share
 %dir %{_datadir}/%{name}/share/config
 %{_datadir}/%{name}/share/config/images_galaxy.zip
 
 %files icon-theme-hicontrast
-%defattr(-,root,root)
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/share
 %dir %{_datadir}/%{name}/share/config
 %{_datadir}/%{name}/share/config/images_hicontrast.zip
 
 %files icon-theme-sifr
-%defattr(-,root,root)
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/share
 %dir %{_datadir}/%{name}/share/config
@@ -1486,13 +1452,11 @@ exit 0
 %{_datadir}/%{name}/share/config/images_sifr_dark.zip
 
 %files icon-theme-tango
-%defattr(-,root,root)
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/share
 %dir %{_datadir}/%{name}/share/config
 %{_datadir}/%{name}/share/config/images_tango.zip
 
 %files -f file-lists/branding_upstream.txt branding-upstream
-%defattr(-,root,root)
 
 %changelog