Accepting request 429122 from GNOME:Factory

New stable (forwarded request 428823 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/429122
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-calculator?expand=0&rev=29

gnome-calculator-3.20.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2af1c12a12a230f90fc221ff908efd80fe7eebfeaad56cd698c393d2fc34a8fb
-size 1347584

gnome-calculator-3.22.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa0f192fc0cad43a8520d4015780ce008d9fc6201bd2dd6dc06365ba45458728
+size 1352336

gnome-calculator.changes

@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Mon Sep 19 20:02:16 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.22.0:
+  + Fix base change for log, fixes bgo#748729.
+  + Math buttons: fix a (potential) crash loading financial
+    dialogs.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Sep 12 19:16:59 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.92:
+  + Fix the build.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sat Aug 20 11:18:38 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.90:
+  + Added 'period' keypress when the delete key on the numpad is
+    pressed.
+  + lib: prevents segfault when elements of division to zero have
+    null assigned tokens (bgo#769364).
+  + Add Language headers to po files.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sat Aug 20 11:18:37 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.2:
+  + Distribute history-view.ui and history-entry.ui.
+  + Updated translations.
+- Drop gcalctool and gcalctool-lang Obsoletes: Removed since 3.8.0
+  release, there is no openSUSE release with GNOME that old.
+- Conditionally apply translations-update-upstream BuildRequires
+  and macro for non-openSUSE only.
+- Drop history-entry.ui and history-view.ui: No longer missing.
+
 -------------------------------------------------------------------
 Sat Aug 20 11:18:36 UTC 2016 - dimstar@opensuse.org
 

gnome-calculator.spec

@@ -17,20 +17,19 @@
 
 
 Name:           gnome-calculator
-Version:        3.20.2
+Version:        3.22.0
 Release:        0
 Summary:        A GNOME Calculator Application
 License:        GPL-3.0+
 Group:          Productivity/Scientific/Math
 Url:            http://www.gnome.org
-Source:         http://download.gnome.org/sources/gnome-calculator/3.20/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-calculator/3.22/%{name}-%{version}.tar.xz
-# Source files that were missing in the tarball
-Source1:        history-entry.ui
-Source2:        history-view.ui
 BuildRequires:  fdupes
 BuildRequires:  intltool >= 0.50
 BuildRequires:  mpfr-devel
+%if !0%{?is_opensuse}
 BuildRequires:  translation-update-upstream
+%endif
 BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(gio-2.0) >= 2.40
@@ -40,11 +39,6 @@ BuildRequires:  pkgconfig(gtksourceview-3.0) >= 3.15.1
 BuildRequires:  pkgconfig(libsoup-2.4) >= 2.42
 BuildRequires:  pkgconfig(libxml-2.0)
 Recommends:     %{name}-lang
-# gcactool was renamed to gnome-calculator. Last known version was 6.6.2
-Obsoletes:      gcalctool <= 6.6.2
-# gcalctool-lang package should be obsoleted, obviously by the -lang package, but that's not possible.
-# So for an easy upgrade path, we obsolete it in the main package.
-Obsoletes:      gcalctool-lang <= 6.6.2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %glib2_gsettings_schema_requires
 
@@ -64,8 +58,9 @@ search results from GNOME Calculator.
 %lang_package
 %prep
 %setup -q
-cp %{S:1} %{S:2} data/
+%if !0%{?is_opensuse}
 translation-update-upstream
+%endif
 
 %build
 %configure \

history-entry.ui

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
-<interface>
-  <requires lib="gtk+" version="3.16"/>
-  <template class="HistoryEntry" parent="GtkListBoxRow">
-    <child>
-      <object class="GtkGrid" id="grid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="column_homogeneous">True</property>
-        <child>
-          <object class="GtkLabel" id="equation_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
-            <property name="xalign">0.0</property>
-            <property name="yalign">0.0</property>
-            <property name="ellipsize">end</property>
-            <property name="max_width_chars">1</property>
-            <signal name="button-press-event" handler="equation_clicked_cb" swapped="no"/>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="answer_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
-            <property name="xalign">0.0</property>
-            <property name="yalign">0.0</property>
-            <property name="ellipsize">end</property>
-            <property name="max_width_chars">1</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-            <signal name="button-press-event" handler="answer_clicked_cb" swapped="no"/>
-          </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>

history-view.ui

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
-<interface>
-  <requires lib="gtk+" version="3.16"/>
-  <template class="HistoryView" parent="GtkScrolledWindow">
-    <property name="width_request">100</property>
-    <property name="height_request">100</property>
-    <property name="visible">True</property>
-    <property name="can_focus">True</property>
-    <property name="vexpand">True</property>
-    <property name="hscrollbar_policy">never</property>
-    <property name="shadow_type">etched-out</property>
-    <signal name="size-allocate" handler="scroll_bottom" swapped="no"/>
-    <child>
-      <object class="GtkViewport" id="viewport">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkListBox" id="listbox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="vexpand">True</property>
-            <property name="border_width">5</property>
-            <property name="selection_mode">none</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>