From b03e3f22465aac22927f00e52e17faa7e346c7af1c47df8a923f324f06c0b827 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Mar 2018 09:48:24 +0000 Subject: [PATCH] Accepting request 583486 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/583486 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnumeric?expand=0&rev=153 --- gnumeric.changes | 5 +++++ gnumeric.spec | 21 ++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/gnumeric.changes b/gnumeric.changes index 6abca50..96887f3 100644 --- a/gnumeric.changes +++ b/gnumeric.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:30:53 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Wed Jan 24 13:04:08 UTC 2018 - pgajdos@suse.com diff --git a/gnumeric.spec b/gnumeric.spec index 3c2ff77..704f058 100644 --- a/gnumeric.spec +++ b/gnumeric.spec @@ -20,9 +20,9 @@ Name: gnumeric Version: 1.12.38 Release: 0 Summary: Spreadsheet Application -License: GPL-2.0 or GPL-3.0 +License: GPL-2.0-only OR GPL-3.0-only Group: Productivity/Office/Spreadsheets -Url: http://www.gnumeric.org/ +URL: http://www.gnumeric.org/ Source0: http://download.gnome.org/sources/gnumeric/1.12/%{name}-%{version}.tar.xz Source1: gnumeric-rpmlintrc BuildRequires: bison @@ -32,10 +32,8 @@ BuildRequires: intltool BuildRequires: itstool BuildRequires: libgsf-devel BuildRequires: libtool +BuildRequires: pkgconfig BuildRequires: python-devel -%if !0%{?is_opensuse} -BuildRequires: translation-update-upstream -%endif BuildRequires: update-desktop-files BuildRequires: pkgconfig(gio-2.0) >= 2.38.0 BuildRequires: pkgconfig(glib-2.0) >= 2.38.0 @@ -60,9 +58,11 @@ Recommends: liberation-fonts Recommends: mimehandler(x-scheme-handler/ghelp) Provides: gnumeric2 = %{version} Obsoletes: gnumeric2 < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} %{?libperl_requires} +%if !0%{?is_opensuse} +BuildRequires: translation-update-upstream +%endif %description Gnumeric is a spreadsheet application with advanced features and @@ -130,6 +130,7 @@ needs. Gnumeric is part of the GNOME project. %lang_package + %prep %setup -q %if !0%{?is_opensuse} @@ -164,12 +165,11 @@ find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot}%{_datadir} %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files -%defattr(-, root, root) -%doc AUTHORS BEVERAGES BUGS COPYING COPYING-gpl2 COPYING-gpl3 HACKING MAINTAINERS NEWS README ChangeLog OChangeLog* +%license COPYING +%doc AUTHORS BEVERAGES BUGS COPYING-gpl2 COPYING-gpl3 HACKING MAINTAINERS NEWS README ChangeLog OChangeLog* %dir %{_datadir}/appdata/ %{_datadir}/appdata/%{name}.appdata.xml %{_bindir}/* @@ -193,13 +193,12 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_datadir}/pixmaps/*.png %{_datadir}/pixmaps/win32-gnumeric.ico %{_datadir}/pixmaps/gnumeric/ -%{_mandir}/man?/*.* +%{_mandir}/man?/*%{ext_man} %files doc %doc %{_datadir}/help/C/%{name} %files devel -%defattr(-, root, root) %{_includedir}/libspreadsheet-*/ %{_libdir}/pkgconfig/libspreadsheet-*.pc