Accepting request 100668 from home:vuntz:branches:GNOME:Apps

Small cleanup

OBS-URL: https://build.opensuse.org/request/show/100668
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnumeric?expand=0&rev=56

gnumeric.changes

@@ -1,48 +1,56 @@
+-------------------------------------------------------------------
+Thu Jan 19 07:56:17 UTC 2012 - vuntz@opensuse.org
+
+- Add explicit pkgconfig() BuildRequires: glib-2.0, pango,
+  pangocairo. Those were all implicitly brought in before.
+- Change goffice-devel BuildRequires to pkgconfig(libgoffice-0.10),
+  to avoid any confusion between goffice-0_8 and goffice.
+- Stop changing Name of gnumeric.desktop: it's already fine
+  upstream.
+
 -------------------------------------------------------------------
 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:
+  + Highlights:
+    - Gnumeric uses GTK+ 3, not GTK+ 2.
+    - Gnumeric uses GTK+'s ui manager files, not libglade.
+    - Gnumeric uses GSettings, not GConf.
+    - Lots of small bug fixes.
+  + Various fixes for xls, xlsx and ODF compatibility.
+  + Add support for SVG images.
   + 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,
+  + Remove obsolete Hildon port and obsolete code.
-    bgo#655877, bgo#535473, bgo#656799, bgo#634803, bgo#356711,
+  + Bugs fixed: bgo#304007, bgo#356711, bgo#425685, bgo#455712,
-    bgo#657506, bgo#658223, bgo#658916, bgo#660242, bgo#658981,
+    bgo#535473, bgo#584380, bgo#603533, bgo#627509, bgo#628472,
-    bgo#660248, bgo#660657, bgo#660605, bgo#661958, bgo#662056,
+    bgo#634803, bgo#645673, bgo#645842, bgo#651561, bgo#655877,
-    bgo#662056, bgo#662310, bgo#662331, bgo#662361, bgo#662149,
+    bgo#656418, bgo#656799, bgo#657036, bgo#657506, bgo#658140,
-    bgo#425685, bgo#662472, bgo#663078, bgo#627509, bgo#663135,
+    bgo#658194, bgo#658223, bgo#658639, bgo#658916, bgo#658981,
-    bgo#603533, bgo#662474, bgo#663117, bgo#661405, bgo#455712,
+    bgo#658982, bgo#659246, bgo#660241, bgo#660242, bgo#660248,
-    bgo#664351, bgo#664447, bgo#664754, bgo#645673, bgo#656418,
+    bgo#660605, bgo#660657, bgo#661213, bgo#661405, bgo#661720,
-    bgo#645842, bgo#658194, bgo#658639, bgo#657036, bgo#659246,
+    bgo#661855, bgo#661958, bgo#662056, bgo#662056, bgo#662149,
-    bgo#660241, bgo#661213, bgo#661720, bgo#661855, bgo#628472,
+    bgo#662310, bgo#662331, bgo#662361, bgo#662412, bgo#662413,
-    bgo#663216, bgo#663671, bgo#663663, bgo#663802, bgo#664243,
+    bgo#662472, bgo#662474, bgo#662551, bgo#663078, bgo#663117,
-    bgo#664692, deb#642135, bgo#658140, bgo#658982, bgo#662551,
+    bgo#663135, bgo#663216, bgo#663663, bgo#663671, bgo#663712,
-    bgo#663712, bgo#304007, lp#262777
+    bgo#663802, bgo#664243, bgo#664351, bgo#664447, bgo#664692,
+    bgo#664754, deb#642135, 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
+- Replace gtk2-devel BuildRequires with pkgconfig(gtk+-3.0),
-  GSettings this is no longer needed.
+  following upstreams change to GTK 3.
+- Drop gconf2-devel 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

gnumeric.spec

@@ -25,7 +25,6 @@ Group:          Productivity/Office/Spreadsheets
 Url:            http://www.gnumeric.org/
 Source0:        http://download.gnome.org/sources/gnumeric/1.11/%{name}-%{version}.tar.xz
 BuildRequires:  fdupes
-BuildRequires:  goffice-devel
 BuildRequires:  intltool
 BuildRequires:  libgda-devel
 BuildRequires:  libgsf-devel
@@ -37,8 +36,11 @@ 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(glib-2.0) >= 2.28.0
-BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.0.0
+BuildRequires:  pkgconfig(libgoffice-0.10) >= 0.9.1
+BuildRequires:  pkgconfig(pango) >= 1.24.0
+BuildRequires:  pkgconfig(pangocairo) >= 1.24.0
 Recommends:     %{name}-lang
 Recommends:     ghostscript-fonts-std
 Recommends:     liberation-fonts
@@ -116,8 +118,8 @@ make %{?_smp_mflags}
 %make_install
 # FIXME: Build as root modifies system!
 #   gnumeric-1.6.3: --disable-scrollkeeper does not work properly.
-rm -rf %{buildroot}%{_localstatedir}/scrollkeeper
+rm -r %{buildroot}%{_localstatedir}/scrollkeeper
-%suse_update_desktop_file -r -N Gnumeric %{name} Office Spreadsheet GNOME GTK
+%suse_update_desktop_file -r %{name} Office Spreadsheet GNOME GTK
 %find_lang %{name} %{?no_lang_C}
 %find_lang gnumeric-functions %{?no_lang_C} %{name}.lang
 find %{buildroot} -type f -name "*.la" -delete -print
@@ -163,15 +165,15 @@ rm -rf %{buildroot}
 %{_libdir}/gnumeric/*/plugins/*/*.py
 %{_libdir}/gnumeric/*/plugins/*/*.pl
 %{_libdir}/gnumeric/*/plugins/gnome-glossary/glossary-po-header
-%{_libdir}/goffice/
+%{_libdir}/goffice/*/plugins/gnumeric/
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/gnumeric.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.gnumeric.dialogs.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gnumeric.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gnumeric.plugin.gschema.xml
 %{_datadir}/gnumeric/
 %{_datadir}/icons/hicolor/*/apps/gnumeric.*
 %{_datadir}/pixmaps/*.png
-%{_datadir}/pixmaps/*.ico
+%{_datadir}/pixmaps/win32-gnumeric.ico
 %{_datadir}/pixmaps/gnumeric/
 %{_mandir}/man?/*.*