Accepting request 519360 from GNOME:Next

Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/519360
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-color-manager?expand=0&rev=117

gnome-color-manager-3.24.0.tar.xz

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

gnome-color-manager-3.25.90.tar.xz

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

gnome-color-manager-meson.patch

@@ -0,0 +1,258 @@
+From 2ca18fb2c496c96563f282ff61e37931e89d90de Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Thu, 17 Aug 2017 14:28:53 +0200
+Subject: [PATCH]  build: Do not hardcode installation paths
+
+https://bugzilla.gnome.org/show_bug.cgi?id=786424
+---
+ data/appdata/meson.build |  2 +-
+ data/figures/meson.build |  4 ++--
+ data/icons/meson.build   |  6 +++---
+ data/meson.build         |  2 +-
+ data/targets/meson.build |  2 +-
+ data/ti1/meson.build     |  2 +-
+ man/meson.build          | 10 +++++-----
+ meson.build              | 28 ++++++++++++----------------
+ src/meson.build          |  7 +------
+ 9 files changed, 27 insertions(+), 36 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 63c6913..3a97041 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -4,5 +4,5 @@ i18n.merge_file(
+   type: 'xml',
+   po_dir: join_paths(meson.source_root(), 'po'),
+   install: true,
+-  install_dir: join_paths(get_option('datadir'), 'metainfo')
++  install_dir: join_paths(prefixed_datadir, 'metainfo')
+ )
+diff --git a/data/figures/meson.build b/data/figures/meson.build
+index 9bf6556..695429a 100644
+--- a/data/figures/meson.build
++++ b/data/figures/meson.build
+@@ -4,7 +4,7 @@ install_data([
+   'viewer-example-02.png',
+   'viewer-example-03.png',
+   ],
+-  install_dir : 'share/gnome-color-manager/figures'
++  install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/figures')
+ )
+ 
+ install_data([
+@@ -16,5 +16,5 @@ install_data([
+   'scan-target-good.svg',
+   'scan-target.svg',
+   ],
+-  install_dir : 'share/gnome-color-manager/icons'
++  install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/icons')
+ )
+diff --git a/data/icons/meson.build b/data/icons/meson.build
+index 9fc2ede..f1b05b3 100644
+--- a/data/icons/meson.build
++++ b/data/icons/meson.build
+@@ -4,7 +4,7 @@ foreach size: icon_sizes
+   install_data([
+     size + '/gnome-color-manager.png',
+     ],
+-    install_dir : 'share/icons/hicolor/' + size + '/apps',
++    install_dir : join_paths(prefixed_datadir, 'icons/hicolor/' + size + '/apps'),
+   )
+ endforeach
+ 
+@@ -12,7 +12,7 @@ endforeach
+ install_data([
+   'scalable/gnome-color-manager.svg',
+   ],
+-  install_dir : 'share/icons/hicolor/scalable/apps'
++  install_dir : join_paths(prefixed_datadir, 'icons/hicolor/scalable/apps')
+ )
+ 
+ install_data([
+@@ -20,5 +20,5 @@ install_data([
+   'scalable/crt.svg',
+   'scalable/projector.svg',
+   ],
+-  install_dir : 'share/gnome-color-manager/icons/icons'
++  install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/icons/icons')
+ )
+diff --git a/data/meson.build b/data/meson.build
+index af8280f..069395c 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -17,6 +17,6 @@ foreach desktop_file: desktop_files
+     type: 'desktop',
+     po_dir: join_paths(meson.source_root(), 'po'),
+     install: true,
+-    install_dir: join_paths(get_option('datadir'), 'applications')
++    install_dir: join_paths(prefixed_datadir, 'applications')
+   )
+ endforeach
+diff --git a/data/targets/meson.build b/data/targets/meson.build
+index 9f0a0c7..50d33f4 100644
+--- a/data/targets/meson.build
++++ b/data/targets/meson.build
+@@ -11,5 +11,5 @@ install_data([
+   'QPcard_202.png',
+   'unknown.png',
+   ],
+-  install_dir : 'share/gnome-color-manager/targets'
++  install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/targets')
+ )
+diff --git a/data/ti1/meson.build b/data/ti1/meson.build
+index 45cbec6..c16ceed 100644
+--- a/data/ti1/meson.build
++++ b/data/ti1/meson.build
+@@ -6,5 +6,5 @@ install_data([
+   'printer-normal.ti1',
+   'printer-short.ti1',
+   ],
+-  install_dir : 'share/gnome-color-manager/ti1'
++  install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/ti1')
+ )
+diff --git a/man/meson.build b/man/meson.build
+index 81d27f5..594fbb7 100644
+--- a/man/meson.build
++++ b/man/meson.build
+@@ -5,34 +5,34 @@ if docbook2man.found()
+     input : 'gcm-calibrate.sgml',
+     command : [docbook2man, '@INPUT@', '--output', 'man'],
+     install : true,
+-    install_dir : 'share/man/man1'
++    install_dir : join_paths(prefixed_mandir, 'man1'),
+   )
+   custom_target('gcm-import-man',
+     output : 'gcm-import.1',
+     input : 'gcm-import.sgml',
+     command : [docbook2man, '@INPUT@', '--output', 'man'],
+     install : true,
+-    install_dir : 'share/man/man1'
++    install_dir : join_paths(prefixed_mandir, 'man1'),
+   )
+   custom_target('gcm-inspect-man',
+     output : 'gcm-inspect.1',
+     input : 'gcm-inspect.sgml',
+     command : [docbook2man, '@INPUT@', '--output', 'man'],
+     install : true,
+-    install_dir : 'share/man/man1'
++    install_dir : join_paths(prefixed_mandir, 'man1'),
+   )
+   custom_target('gcm-picker-man',
+     output : 'gcm-picker.1',
+     input : 'gcm-picker.sgml',
+     command : [docbook2man, '@INPUT@', '--output', 'man'],
+     install : true,
+-    install_dir : 'share/man/man1'
++    install_dir : join_paths(prefixed_mandir, 'man1'),
+   )
+   custom_target('gcm-viewer-man',
+     output : 'gcm-viewer.1',
+     input : 'gcm-viewer.sgml',
+     command : [docbook2man, '@INPUT@', '--output', 'man'],
+     install : true,
+-    install_dir : 'share/man/man1'
++    install_dir : join_paths(prefixed_mandir, 'man1'),
+   )
+ endif
+diff --git a/meson.build b/meson.build
+index 917c5db..771a028 100644
+--- a/meson.build
++++ b/meson.build
+@@ -80,6 +80,13 @@ add_global_link_arguments(
+   language: 'c'
+ )
+ 
++prefixed_bindir = join_paths(get_option('prefix'), get_option('bindir'))
++prefixed_localedir = join_paths(get_option('prefix'), get_option('localedir'))
++prefixed_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
++prefixed_mandir = join_paths(get_option('prefix'), get_option('mandir'))
++prefixed_datadir = join_paths(get_option('prefix'), get_option('datadir'))
++prefixed_pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'gnome-software')
++
+ libgio = dependency('gio-2.0', version : '>= 2.25.9')
+ libgtk = dependency('gtk+-3.0', version : '>= 2.91.0')
+ libexif = dependency('libexif')
+@@ -109,22 +116,11 @@ gnome = import('gnome')
+ i18n = import('i18n')
+ 
+ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+-conf.set_quoted('LOCALEDIR',
+-                join_paths(get_option('prefix'),
+-                           get_option('localedir')))
+-conf.set_quoted('DATADIR',
+-                join_paths(get_option('prefix'),
+-                           get_option('datadir')))
+-conf.set_quoted('PKGDATADIR',
+-                join_paths(get_option('prefix'),
+-                           get_option('datadir'),
+-                           'gnome-software'))
+-conf.set_quoted('BINDIR',
+-                join_paths(get_option('prefix'),
+-                           get_option('bindir')))
+-conf.set_quoted('LIBEXECDIR',
+-                join_paths(get_option('prefix'),
+-                           get_option('libexecdir')))
++conf.set_quoted('LOCALEDIR', prefixed_localedir)
++conf.set_quoted('DATADIR', prefixed_datadir)
++conf.set_quoted('PKGDATADIR', prefixed_pkgdatadir)
++conf.set_quoted('BINDIR', prefixed_bindir)
++conf.set_quoted('LIBEXECDIR', prefixed_libexecdir)
+ configure_file(
+   output : 'config.h',
+   configuration : conf
+diff --git a/src/meson.build b/src/meson.build
+index ebf0b04..73ba87c 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -29,7 +29,7 @@ if get_option('enable-exiv')
+     ],
+     c_args : cargs,
+     install : true,
+-    install_dir : 'libexec',
++    install_dir : prefixed_libexecdir,
+   )
+ endif
+ 
+@@ -74,7 +74,6 @@ executable(
+   ],
+   c_args : cargs,
+   install : true,
+-  install_dir : 'bin'
+ )
+ 
+ executable(
+@@ -96,7 +95,6 @@ executable(
+   ],
+   c_args : cargs,
+   install : true,
+-  install_dir : 'bin'
+ )
+ 
+ executable(
+@@ -118,7 +116,6 @@ executable(
+   ],
+   c_args : cargs,
+   install : true,
+-  install_dir : 'bin'
+ )
+ 
+ executable(
+@@ -142,7 +139,6 @@ executable(
+   ],
+   c_args : cargs,
+   install : true,
+-  install_dir : 'bin'
+ )
+ 
+ executable(
+@@ -169,7 +165,6 @@ executable(
+   ],
+   c_args : cargs,
+   install : true,
+-  install_dir : 'bin'
+ )
+ 
+ if get_option('enable-tests')
+-- 
+2.13.3
+

gnome-color-manager.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Aug 15 13:50:56 UTC 2017 - dimstar@opensuse.org
+
+- Update to version 3.25.90:
+  + Switch to meson build system.
+  + Updated translations.
+- Add meson BuildRequires and switch autotools macros configure,
+  make and makeinstall to meson, meson_build and meson_install
+  following upstream switch to Meson build system.
+- Add gnome-color-manager-meson.patch: fix build system not to
+  hardcode directory names (like libexec).
+
 -------------------------------------------------------------------
 Thu Mar 23 13:11:50 UTC 2017 - zaitor@opensuse.org
 

gnome-color-manager.spec

@@ -18,16 +18,20 @@
 
 
 Name:           gnome-color-manager
-Version:        3.24.0
+Version:        3.25.90
 Release:        0
 Summary:        Color management tools for GNOME
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://projects.gnome.org/gnome-color-manager
-Source:         http://download.gnome.org/sources/gnome-color-manager/3.24/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-color-manager/3.25/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-color-manager-meson.patch bgo#786424 dimstar@opensuse.org -- Do not hardcode directory names
+Patch0:         gnome-color-manager-meson.patch
 BuildRequires:  docbook-utils
 BuildRequires:  gcc-c++
 BuildRequires:  libtiff-devel
+BuildRequires:  meson
+BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
@@ -40,64 +44,52 @@ BuildRequires:  pkgconfig(lcms2) >= 2.2
 BuildRequires:  pkgconfig(libcanberra-gtk3)
 BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(vte-2.91)
-# We only recommend PackageKit - knowing that some features are not available if not present
-# For managed setups, this does not matter, as the user is not supposed to be bothered with
-# such things anyway (see bnc#895997).
-Recommends:     PackageKit
 Requires:       argyllcms
 Requires:       colord
 Requires:       colord-color-profiles
 Recommends:     %{name}-lang
+# We only recommend PackageKit - knowing that some features are not available if not present
+# For managed setups, this does not matter, as the user is not supposed to be bothered with
+# such things anyway (see bnc#895997).
+Recommends:     PackageKit
 Obsoletes:      gnome-color-manager-devel < %{version}
 Obsoletes:      libcolor-glib1 < %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 GNOME Color Manager is a session framework that makes it easy to manage,
 install and generate color profiles in the GNOME desktop.
 
 %lang_package
+
 %prep
 %setup -q
+%patch0 -p1
 translation-update-upstream
 
 %build
-%configure --disable-static   
+%meson
-%{__make} %{?jobs:-j %jobs} V=1
+%meson_build
 
 %install
-%makeinstall
+%meson_install
-find %{buildroot} -type f -name "*.la" -delete -print
 %suse_update_desktop_file gcm-calibrate
 %suse_update_desktop_file gcm-import
 %suse_update_desktop_file gcm-picker
 %suse_update_desktop_file org.gnome.ColorProfileViewer HardwareSettings
 %find_lang %{name} %{?no_lang_C}
 
-%clean
-rm -rf %{buildroot}
-
-%post
-%desktop_database_post
-%icon_theme_cache_post
-
-%postun
-%desktop_database_postun
-%icon_theme_cache_postun
-
 %files
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING MAINTAINERS NEWS README
+%doc AUTHORS COPYING MAINTAINERS README
 %{_bindir}/gcm-*
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome-color-manager/
 %doc %{_datadir}/help/C/gnome-color-manager/
 %{_datadir}/icons/hicolor/*/apps/gnome-color-manager.*
-%{_datadir}/icons/hicolor/*/mimetypes/application-vnd.iccprofile.*
 %{_mandir}/man?/*.*
 %{_libexecdir}/gcm-helper-exiv
-%dir %{_datadir}/appdata/
+%dir %{_datadir}/metainfo
-%{_datadir}/appdata/org.gnome.ColorProfileViewer.appdata.xml
+%{_datadir}/metainfo/org.gnome.ColorProfileViewer.appdata.xml
 
 %files lang -f %{name}.lang