From 0c7248921722f078b2f325a77a8e27fd73f285a2 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 15 Mar 2021 12:15:18 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/gnome-photos.git#c72278dd9417df686713ed5852b2792b7250835c --- .gitignore | 1 + gnome-photos.spec | 42 +++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index de6d596..6219541 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ /gnome-photos-3.37.91.1.tar.xz /gnome-photos-3.38.0.tar.xz /gnome-photos-3.38.1.tar.xz +/gnome-photos-40.beta.tar.xz diff --git a/gnome-photos.spec b/gnome-photos.spec index b0b66c6..c70bb61 100644 --- a/gnome-photos.spec +++ b/gnome-photos.spec @@ -1,31 +1,36 @@ +%global tarball_version %%(echo %{version} | tr '~' '.') +%global major_version %%(echo %%{tarball_version} | cut -d. -f1) + %global cairo_version 1.14.0 %global dazzle_version 3.26.0 -%global gdata_version 0.15.2 +%global gdata_version 0.17.3 %global gdk_pixbuf_version 2.36.8 %global gegl_version 0.4.0 %global gettext_version 0.19.8 %global gexiv2_version 0.10.8 %global gfbgraph_version 0.2.1 -%global glib2_version 2.57.2 +%global glib2_version 2.62.0 %global goa_version 3.8.0 %global grilo_version 0.3.5 %global gtk3_version 3.22.16 -%global tracker_version 2.0.3 -%global tracker_miners_version 2.0.4 +%global handy_version 1.1.90 +%global tracker_miners_version 3.0.0 Name: gnome-photos -Version: 3.38.1 +Version: 40~beta Release: 1%{?dist} Summary: Access, organize and share your photos on GNOME # GNOME Photos itself is GPLv3+, but the bundled libgd is LGPLv2+ License: GPLv3+ and LGPLv2+ URL: https://wiki.gnome.org/Apps/Photos -Source0: http://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz BuildRequires: desktop-file-utils +BuildRequires: docbook-style-xsl BuildRequires: gettext >= %{gettext_version} BuildRequires: itstool +BuildRequires: libxslt BuildRequires: meson BuildRequires: pkgconfig(babl) BuildRequires: pkgconfig(cairo) >= %{cairo_version} @@ -44,9 +49,9 @@ BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} BuildRequires: pkgconfig(libdazzle-1.0) >= %{dazzle_version} BuildRequires: pkgconfig(libgdata) >= %{gdata_version} BuildRequires: pkgconfig(libgfbgraph-0.2) >= %{gfbgraph_version} +BuildRequires: pkgconfig(libhandy-1) >= %{handy_version} BuildRequires: pkgconfig(libjpeg) -BuildRequires: pkgconfig(tracker-control-2.0) >= %{tracker_version} -BuildRequires: pkgconfig(tracker-sparql-2.0) >= %{tracker_version} +BuildRequires: pkgconfig(tracker-sparql-3.0) Requires: baobab @@ -65,8 +70,8 @@ Requires: gtk3%{?_isa} >= %{gtk3_version} Requires: libdazzle%{?isa} >= %{dazzle_version} Requires: libgdata%{?_isa} >= %{gdata_version} Requires: libgexiv2%{?_isa} >= %{gexiv2_version} -Requires: tracker >= %{tracker_version} -Requires: tracker-miners >= %{tracker_miners_version} +Requires: libhandy1%{?_isa} >= %{handy_version} +Requires: tracker3-miners >= %{tracker_miners_version} # libgd is not meant to be installed as a system-wide shared library. # It is just a way for GNOME applications to share widgets and other common @@ -93,7 +98,7 @@ This package contains the installable tests for %{name}. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{tarball_version} %build @@ -105,6 +110,7 @@ This package contains the installable tests for %{name}. -Ddogtail=false \ %endif -Dinstalled_tests=true \ + -Dmanuals=true \ %meson_build @@ -112,6 +118,10 @@ This package contains the installable tests for %{name}. %install %meson_install +rm -rf %{buildroot}%{_datadir}/dbus-1/services/org.gnome.Photos.Tracker3.Miner.Extract.service +rm -rf %{buildroot}%{_datadir}/dbus-1/services/org.gnome.Photos.Tracker3.Miner.Files.service +rm -rf %{buildroot}%{_datadir}/tracker3-miners + # Upstream doesn't install with desktop-file-install, so let's check desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Photos.desktop @@ -124,16 +134,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Photos.desk %{_datadir}/metainfo/org.gnome.Photos.appdata.xml %{_datadir}/applications/org.gnome.Photos.desktop %{_datadir}/dbus-1/services/org.gnome.Photos.service -%{_datadir}/dbus-1/services/org.gnome.Photos.Tracker1.service -%{_datadir}/dbus-1/services/org.gnome.Photos.Tracker1.Miner.Extract.service -%{_datadir}/dbus-1/services/org.gnome.Photos.Tracker1.Miner.Files.service %{_datadir}/glib-2.0/schemas/org.gnome.photos.gschema.xml %{_datadir}/gnome-shell/ %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Photos.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Photos-symbolic.svg -%{_datadir}/tracker/domain-ontologies/org.gnome.Photos.rule -%{_datadir}/tracker/miners/org.gnome.Photos.Tracker1.Miner.Extract.service -%{_datadir}/tracker/miners/org.gnome.Photos.Tracker1.Miner.Files.service +%{_datadir}/man/man1/%{name}.1* %{_docdir}/%{name} %dir %{_libdir}/%{name} @@ -147,6 +152,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Photos.desk %changelog +* Fri Mar 12 2021 Debarshi Ray - 40~beta-1 +- Update to 40.beta + * Tue Feb 16 2021 Debarshi Ray - 3.38.1-1 - Update to 3.38.1 diff --git a/sources b/sources index 74f9bf4..8ab8005 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-photos-3.38.1.tar.xz) = b10460f71238703ae3f5bde9f9a4b94d7676a7a0f97cfe2602829ca2c2d80b06ff9c94e997edce4eecf911b7a6cefcabd013fefe2b5f776518f3099aa4db9fda +SHA512 (gnome-photos-40.beta.tar.xz) = c608e51f4d162260c10c9d06bf8e4c79116be84e40bacdb170d8921605bf23d45d400e8ff951025a38ac32545360578747b26c0f3b2b5e9126bd6d4e34a1d28a