diff --git a/.gitignore b/.gitignore index c0810c8..bb7d5d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-clocks-3.22.1.tar.xz +SOURCES/gnome-clocks-3.28.0.tar.xz diff --git a/.gnome-clocks.metadata b/.gnome-clocks.metadata index 75bc119..8d34e10 100644 --- a/.gnome-clocks.metadata +++ b/.gnome-clocks.metadata @@ -1 +1 @@ -63a3ac348e6be9848331b97d5e24b66ec9a0a903 SOURCES/gnome-clocks-3.22.1.tar.xz +f3f5ceb160a5381b62cabb2cf51591f838fabc06 SOURCES/gnome-clocks-3.28.0.tar.xz diff --git a/SPECS/gnome-clocks.spec b/SPECS/gnome-clocks.spec index 8e75db1..bc11a65 100644 --- a/SPECS/gnome-clocks.spec +++ b/SPECS/gnome-clocks.spec @@ -1,52 +1,46 @@ +%global libgweather_version 3.27.2 + Name: gnome-clocks -Version: 3.22.1 +Version: 3.28.0 Release: 1%{?dist} Summary: Clock application designed for GNOME 3 License: GPLv2+ URL: https://wiki.gnome.org/Apps/Clocks -Source0: https://download.gnome.org/sources/gnome-clocks/3.22/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-clocks/3.28/%{name}-%{version}.tar.xz -BuildRequires: gtk3-devel -Buildrequires: gobject-introspection-devel -BuildRequires: libcanberra-devel -BuildRequires: libgweather-devel >= 3.13.91 -BuildRequires: gnome-desktop3-devel -BuildRequires: vala -BuildRequires: desktop-file-utils glib2-devel itstool -BuildRequires: geoclue2-devel -BuildRequires: geocode-glib-devel +BuildRequires: meson +BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: gsound-devel +BuildRequires: itstool BuildRequires: libappstream-glib +BuildRequires: vala + +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 +BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version} +BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.8 +BuildRequires: pkgconfig(glib-2.0) >= 2.44 +BuildRequires: pkgconfig(gobject-2.0) >= 2.44 +BuildRequires: pkgconfig(libgeoclue-2.0) >= 2.4 +BuildRequires: pkgconfig(geocode-glib-1.0) >= 1.0 +BuildRequires: pkgconfig(gsound) >= 0.98 + +Requires: libgweather%{?_isa} >= %{libgweather_version} %description Clock application designed for GNOME 3 %prep -%setup -q +%autosetup -p1 %build -%configure -make V=1 %{?_smp_mflags} +%meson +%meson_build %install -%make_install +%meson_install %find_lang gnome-clocks --with-gnome -# Update the screenshot shown in the software center -# -# NOTE: It would be *awesome* if this file was pushed upstream. -# -# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. -# -appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/org.gnome.clocks.appdata.xml \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.clocks/a.png \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.clocks/b.png \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.clocks/c.png \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.clocks/d.png \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.clocks/e.png - %check desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.clocks.desktop @@ -71,16 +65,19 @@ fi %{_datadir}/gnome-clocks %{_datadir}/icons/hicolor/*/apps/org.gnome.clocks.png %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.clocks-symbolic.svg -%{_datadir}/appdata/org.gnome.clocks.appdata.xml %{_datadir}/applications/org.gnome.clocks.desktop %{_datadir}/dbus-1/services/org.gnome.clocks.service %{_datadir}/glib-2.0/schemas/org.gnome.clocks.gschema.xml %dir %{_datadir}/gnome-shell/ %dir %{_datadir}/gnome-shell/search-providers/ %{_datadir}/gnome-shell/search-providers/org.gnome.clocks.search-provider.ini - +%{_datadir}/metainfo/org.gnome.clocks.appdata.xml %changelog +* Wed May 23 2018 Kalev Lember - 3.28.0-1 +- Update to 3.28.0 +- Resolves: #1567476 + * Thu Feb 23 2017 Matthias Clasen - 3.22.1-1 - Rebase to 3.22.1 Resolves: #1386881