Hello community,

here is the log from the commit of package baobab for openSUSE:Factory checked 
in at 2018-03-30 11:57:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/baobab (Old)
 and      /work/SRC/openSUSE:Factory/.baobab.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "baobab"

Fri Mar 30 11:57:27 2018 rev:40 rq:592381 version:3.28.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/baobab/baobab.changes    2018-03-14 
19:27:41.813368589 +0100
+++ /work/SRC/openSUSE:Factory/.baobab.new/baobab.changes       2018-03-30 
11:57:30.647239180 +0200
@@ -1,0 +2,11 @@
+Thu Mar 22 13:41:31 UTC 2018 - bjorn....@gmail.com
+
+- Drop gnome-utils Conflicts, not needed for a long time.
+- Drop update-desktop-files BuildRequires and no longer pass
+  suse_update_desktop_file macro.
+- Add baobab-fix-linguas-build-issues.patch: build: Fix setting
+  GNOMELOCALEDIR (bgo#794381), and build: Use LINGUAS file for help
+  (bgo#794449).
+- Update URL to new home in GNOME wiki.
+
+-------------------------------------------------------------------

New:
----
  baobab-fix-linguas-build-issues.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ baobab.spec ++++++
--- /var/tmp/diff_new_pack.bfYbjj/_old  2018-03-30 11:57:31.251217338 +0200
+++ /var/tmp/diff_new_pack.bfYbjj/_new  2018-03-30 11:57:31.255217193 +0200
@@ -18,18 +18,20 @@
 
 
 %define glib2_version 2.44
+
 Name:           baobab
 Version:        3.28.0
 Release:        0
 Summary:        Disk Usage Analyzer
 License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
-URL:            http://www.gnome.org
-Source:         
http://download.gnome.org/sources/baobab/3.28/%{name}-%{version}.tar.xz
+URL:            https://wiki.gnome.org/Apps/DiskUsageAnalyzer
+Source0:        
https://download.gnome.org/sources/baobab/3.28/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM baobab-fix-linguas-build-issues.patch bgo#794381 
bgo#794449 bjorn....@gmail.com -- Fix various linguas issues.
+Patch0:         baobab-fix-linguas-build-issues.patch
 BuildRequires:  fdupes
 BuildRequires:  meson
 BuildRequires:  pkgconfig
-BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.38.0.11
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(gio-2.0) >= %{glib2_version}
@@ -38,7 +40,6 @@
 BuildRequires:  pkgconfig(gobject-2.0) >= %{glib2_version}
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.20
 Recommends:     %{name}-lang
-Conflicts:      gnome-utils < 3.3.1
 
 %description
 Disk Usage Analyzer is a graphical, menu-driven application to analyse
@@ -54,6 +55,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %meson
@@ -62,7 +64,6 @@
 %install
 %meson_install
 
-%suse_update_desktop_file org.gnome.%{name}
 %find_lang %{name} %{?no_lang_C}
 %fdupes %{buildroot}%{_datadir}
 
@@ -75,7 +76,6 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}*.*
 %{_datadir}/glib-2.0/schemas/org.gnome.baobab.gschema.xml
 %{_datadir}/applications/org.gnome.%{name}.desktop
-%dir %{_datadir}/metainfo/
 %{_datadir}/metainfo/org.gnome.baobab.appdata.xml
 %{_datadir}/dbus-1/services/org.gnome.baobab.service
 

++++++ baobab-fix-linguas-build-issues.patch ++++++
>From 884fb555173c46fcb4a80a5cc9cbd32bad8186ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrd...@gmail.com>
Date: Fri, 16 Mar 2018 19:57:53 +0100
Subject: build: Fix setting GNOMELOCALEDIR

https://bugzilla.gnome.org/show_bug.cgi?id=794381
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 30d996d..ad1b1d3 100644
--- a/meson.build
+++ b/meson.build
@@ -23,7 +23,7 @@ conf.set_quoted('PACKAGE_NAME', meson.project_name())
 conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 conf.set_quoted('VERSION', meson.project_version())
 conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-conf.set_quoted('GNOMELOCALEDIR', join_paths(get_option('prefix'), 
get_option('datadir'), '/locale'))
+conf.set_quoted('GNOMELOCALEDIR', join_paths(get_option('prefix'), 
get_option('localedir')))
 configure_file(output: 'config.h', configuration: conf)
 config_h_dir = include_directories('.')
 
-- 
cgit v0.12


>From aee08d643c880f649923c18a1a4bac1045820fd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrd...@gmail.com>
Date: Sun, 18 Mar 2018 18:01:45 +0100
Subject: build: Use LINGUAS file for help

The old method is deprecated.

https://bugzilla.gnome.org/show_bug.cgi?id=794449
---
 help/LINGUAS     | 21 +++++++++++++++++++++
 help/meson.build | 27 +--------------------------
 2 files changed, 22 insertions(+), 26 deletions(-)
 create mode 100644 help/LINGUAS

diff --git a/help/LINGUAS b/help/LINGUAS
new file mode 100644
index 0000000..9f7af5e
--- /dev/null
+++ b/help/LINGUAS
@@ -0,0 +1,21 @@
+ca
+cs
+da
+de
+el
+es
+fi
+fr
+gl
+hr
+hu
+id
+it
+ko
+pl
+pt
+pt_BR
+ru
+sl
+sv
+zh_CN
diff --git a/help/meson.build b/help/meson.build
index 34e7691..549b3d9 100644
--- a/help/meson.build
+++ b/help/meson.build
@@ -17,33 +17,8 @@ help_media = [
   'media/hicolor_apps_48x48_baobab.png'
 ]
 
-help_linguas = [
-  'ca',
-  'cs',
-  'da',
-  'de',
-  'el',
-  'es',
-  'fi',
-  'fr',
-  'gl',
-  'hr',
-  'hu',
-  'id',
-  'it',
-  'ko',
-  'pl',
-  'pt',
-  'pt_BR',
-  'ru',
-  'sl',
-  'sv',
-  'zh_CN'
-]
-
 gnome.yelp(
   meson.project_name(),
   sources: help_files,
-  media: help_media,
-  languages: help_linguas,
+  media: help_media
 )
-- 
cgit v0.12


Reply via email to