Accepting request 99549 from home:dimstar:branches:GNOME:Apps

Update to 1.11.1 OBS-URL: https://build.opensuse.org/request/show/99549 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnumeric?expand=0&rev=55
2012-01-19 07:52:46 +00:00 · 2012-01-19 07:52:46 +00:00 · 6088f9a790
commit 6088f9a790
parent 9ecdba341a
4 changed files with 75 additions and 33 deletions
--- a/gnumeric-1.10.17.tar.bz2
+++ b/gnumeric-1.10.17.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb2a13424811d132fe1be7a6e82d61157a18c630fc91b7409503dbd7ef600ea5
-size 19010738
--- a/gnumeric-1.11.1.tar.xz
+++ b/gnumeric-1.11.1.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ebee914a652858534b9d5d7ce4ea4dcbbd97525227a042ee5bbc2e45756dd3e
+size 14451268
--- a/gnumeric.changes
+++ b/gnumeric.changes
@ -1,3 +1,53 @@
+-------------------------------------------------------------------
+Mon Jan  9 16:37:21 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 1.11.1:
+  + Make things build against gtk+-3.0.
+  + Add support for SVG images using librsvg.
+  + Show range selection cursors even while selecting new regions
+    and on other sheets
+  + Fixed expression range cursor behavior [bgo#664852]
+  + Build fixes relating to embedded ui files [bgo#664828]
+- Changes from version 1.11.0:
+  + Clarify the distinction beween open/save and import/export.
+  + Fully read scientific format from ODF.
+  + Provide progress feedback when generating random numbers.
+  + Add HPFILTER function calculating the Hodrick Prescott Filter.
+  + Enable markup selection in scientific format selector.
+  + Be compatible with the changed LibreOffice ODF documents with
+    tab colours.
+  + Some more number formatting improvements to ODF import/export.
+  + Read and write tick spacing from/to ODF files.
+  + Fix IRR and other functions acting on paired data set when
+    called with fixed arrays.
+  + Bugs fixed: bgo#662412, bgo#662413, bgo#584380, bgo#651561,
+    bgo#655877, bgo#535473, bgo#656799, bgo#634803, bgo#356711,
+    bgo#657506, bgo#658223, bgo#658916, bgo#660242, bgo#658981,
+    bgo#660248, bgo#660657, bgo#660605, bgo#661958, bgo#662056,
+    bgo#662056, bgo#662310, bgo#662331, bgo#662361, bgo#662149,
+    bgo#425685, bgo#662472, bgo#663078, bgo#627509, bgo#663135,
+    bgo#603533, bgo#662474, bgo#663117, bgo#661405, bgo#455712,
+    bgo#664351, bgo#664447, bgo#664754, bgo#645673, bgo#656418,
+    bgo#645842, bgo#658194, bgo#658639, bgo#657036, bgo#659246,
+    bgo#660241, bgo#661213, bgo#661720, bgo#661855, bgo#628472,
+    bgo#663216, bgo#663671, bgo#663663, bgo#663802, bgo#664243,
+    bgo#664692, deb#642135, bgo#658140, bgo#658982, bgo#662551,
+    bgo#663712, bgo#304007, lp#262777
+  + Updated translations.
+- Replace pkgconfig(gtk+-2.0) BuildRequires with
+  pkgconfig(gtk+-3.0), following upstreams change to GTK 3.
+- Add pkgconfig(librsvg-2.0) BuildRequires: A newly introduced
+  dependency to support SVG images.
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+- Drop pkgconfig(gconf-2.0) BuildRequires: with the move to
+  GSettings this is no longer needed.
+- Remove gconf schema handling macros: gconf is no longer used.
+- Clean spec-file using spec-cleaner.
+- Remove explicit Requires from the -devel package: they are added
+  automatically the pkgconfig()-way.
+
 -------------------------------------------------------------------
 Tue Oct 25 18:24:25 UTC 2011 - vuntz@opensuse.org

--- a/gnumeric.spec
+++ b/gnumeric.spec
@ -1,7 +1,7 @@
 #
 # spec file for package gnumeric
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -15,21 +15,17 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

-# norootforbuild
-

 Name:           gnumeric
-Version:        1.10.17
-Release:        1
+Version:        1.11.1
+Release:        0
 Summary:        Spreadsheet Application
 License:        GPL-2.0+
-Url:            http://www.gnumeric.org/
 Group:          Productivity/Office/Spreadsheets
-Source0:        http://download.gnome.org/sources/gnumeric/1.10/%{name}-%{version}.tar.bz2
+Url:            http://www.gnumeric.org/
+Source0:        http://download.gnome.org/sources/gnumeric/1.11/%{name}-%{version}.tar.xz
 BuildRequires:  fdupes
-BuildRequires:  gconf2-devel
 BuildRequires:  goffice-devel
-BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  libgda-devel
 BuildRequires:  libgsf-devel
@ -39,14 +35,18 @@ BuildRequires:  python-gobject2-devel
 BuildRequires:  scrollkeeper
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
+#BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
 Recommends:     %{name}-lang
-Recommends:     liberation-fonts ghostscript-fonts-std
+Recommends:     ghostscript-fonts-std
+Recommends:     liberation-fonts
 # For perl-func plugin
 Recommends:     perl
 Provides:       gnumeric2 = %{version}
 Obsoletes:      gnumeric2 < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%gconf_schemas_prereq

 %description
 Gnumeric is a spreadsheet application with advanced features and
@ -67,10 +67,9 @@ needs.
 Gnumeric is part of the GNOME project.

 %package devel
-License:        GPL-2.0+
 Summary:        Spreadsheet Application
 Group:          Productivity/Office/Spreadsheets
-Requires:       %{name} = %{version} glib2-devel goffice-devel gtk2-devel libglade2-devel libgsf-devel libxml2-devel
+Requires:       %{name} = %{version}

 %description devel
 Gnumeric is a spreadsheet application with advanced features and
@ -105,30 +104,27 @@ for LNG in po/*.po ; do
 done

 %build
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CFLAGS="%{optflags} -fno-strict-aliasing"
 %configure\
 	--disable-scrollkeeper\
 	--disable-static\
 	--enable-ssindex
 #	--enable-pdfdocs
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}

 %install
-%makeinstall
+%make_install
 # FIXME: Build as root modifies system!
-#   gnumeric-1.6.3: --disable-scrollkeeper does not work properly. 
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
+#   gnumeric-1.6.3: --disable-scrollkeeper does not work properly.
+rm -rf %{buildroot}%{_localstatedir}/scrollkeeper
 %suse_update_desktop_file -r -N Gnumeric %{name} Office Spreadsheet GNOME GTK
 %find_lang %{name} %{?no_lang_C}
 %find_lang gnumeric-functions %{?no_lang_C} %{name}.lang
-%find_gconf_schemas
-find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
-%fdupes $RPM_BUILD_ROOT
+find %{buildroot} -type f -name "*.la" -delete -print
+%fdupes %{buildroot}

 %clean
-rm -rf $RPM_BUILD_ROOT
-
-%pre -f %{name}.schemas_pre
+rm -rf %{buildroot}

 %post
 /sbin/ldconfig
@ -138,10 +134,6 @@ rm -rf $RPM_BUILD_ROOT
 %icon_theme_cache_post
 %endif

-%posttrans -f %{name}.schemas_posttrans
-
-%preun -f %{name}.schemas_preun
-
 %postun
 /sbin/ldconfig
 %if 0%{?suse_version} > 1130
@ -150,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 %icon_theme_cache_postun
 %endif

-%files -f %{name}.schemas_list
+%files
 %defattr(-, root, root)
 %doc AUTHORS BEVERAGES BUGS COPYING HACKING MAINTAINERS NEWS README ChangeLog OChangeLog*
 %dir %{_datadir}/gnome/
@ -171,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnumeric/*/plugins/*/*.py
 %{_libdir}/gnumeric/*/plugins/*/*.pl
 %{_libdir}/gnumeric/*/plugins/gnome-glossary/glossary-po-header
-%{_libdir}/goffice/*/plugins/gnumeric
+%{_libdir}/goffice/
 %{_datadir}/applications/*.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.gnumeric.dialogs.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gnumeric.gschema.xml