From 95aeaf3d3740170f99352643793fe8517bdc8aa4 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Feb 18 2021 17:57:22 +0000 Subject: bump to commit 3dfc70d; rebuilt for granite 6 soname bump --- diff --git a/.gitignore b/.gitignore index 5e9df22..27d883f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /elementary-photos-2.6.4.tar.gz /elementary-photos-2.6.5.tar.gz /elementary-photos-2.7.0.tar.gz +/photos-3dfc70d.tar.gz diff --git a/elementary-photos.spec b/elementary-photos.spec index 973de69..282cfdd 100644 --- a/elementary-photos.spec +++ b/elementary-photos.spec @@ -1,3 +1,7 @@ +%global commit 3dfc70dd8ee86cc26d086d9b5fe71edb0bcc11d4 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20210218 + %global srcname photos %global appname io.elementary.%{srcname} @@ -6,11 +10,11 @@ Name: elementary-photos Summary: Photo manager and viewer from elementary Version: 2.7.0 -Release: 5%{?dist} +Release: 6.%{commitdate}git%{shortcommit}%{?dist} License: LGPLv2+ URL: https://github.com/elementary/%{srcname} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{commit}/%{srcname}-%{shortcommit}.tar.gz BuildRequires: desktop-file-utils BuildRequires: gettext @@ -25,7 +29,7 @@ BuildRequires: pkgconfig(gio-2.0) >= 2.20 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.20 BuildRequires: pkgconfig(glib-2.0) >= 2.30.0 BuildRequires: pkgconfig(gmodule-2.0) >= 2.24.0 -BuildRequires: pkgconfig(granite) >= 5.2.0 +BuildRequires: pkgconfig(granite) >= 6.0.0 BuildRequires: pkgconfig(gstreamer-1.0) >= 1.0.0 BuildRequires: pkgconfig(gstreamer-base-1.0) >= 1.0.0 BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 1.0.0 @@ -35,6 +39,7 @@ BuildRequires: pkgconfig(gudev-1.0) >= 145 BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libexif) >= 0.6.16 BuildRequires: pkgconfig(libgphoto2) >= 2.4.2 +BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(libraw) >= 0.13.2 BuildRequires: pkgconfig(libsoup-2.4) >= 2.26.0 BuildRequires: pkgconfig(libwebp) >= 0.4.4 @@ -45,21 +50,17 @@ BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.0.0 Requires: hicolor-icon-theme -Obsoletes: pantheon-photos < 0.2.4-7 -Provides: pantheon-photos = %{version}-%{release} - - %description The elementary continuation of Shotwell, originally written by Yorba Foundation. %prep -%autosetup -n %{srcname}-%{version} -p1 +%autosetup -n %{srcname}-%{commit} -p1 %build -%meson -Dlibunity=false +%meson %meson_build @@ -94,10 +95,14 @@ appstream-util validate-relax --nonet \ %{_datadir}/applications/%{appname}-viewer.desktop %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %{_datadir}/glib-2.0/schemas/%{appname}-extras.gschema.xml +%{_datadir}/icons/hicolor/*/apps/%{appname}.svg %{_datadir}/metainfo/%{appname}.appdata.xml %changelog +* Thu Feb 18 2021 Fabio Valentini - 2.7.0-6.20210218git3dfc70d +- Bump to commit 3dfc70d. Rebuilt for granite 6 soname bump. + * Tue Jan 26 2021 Fedora Release Engineering - 2.7.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index e1f8d16..5de606b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (elementary-photos-2.7.0.tar.gz) = 2ce028658ac39fd0e19d20643c45ef5a23fdc3158471cc75343ca4fea76524eb7d2eddcf721604da323c36fcfbf59c68f3d89cfcd57750e595eb8c47f23a8a51 +SHA512 (photos-3dfc70d.tar.gz) = cda50a6d6c0f4bdc60fa87341e39088b4df7436987ded0f674ea075812890d9c260a66e7e18f464dffc08bdfbccb8f602d406be740ab3dc65347ada131f1e12c