diff --git a/.gitignore b/.gitignore index 983e892..938df92 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ cheese-2.31.1.tar.bz2 /cheese-3.31.90.tar.xz /cheese-3.32.0.tar.xz /cheese-3.32.1.tar.xz +/cheese-3.33.90.1.tar.xz diff --git a/cheese.spec b/cheese.spec index 45a1c86..3584e8f 100644 --- a/cheese.spec +++ b/cheese.spec @@ -1,19 +1,21 @@ Name: cheese Epoch: 2 -Version: 3.32.1 -Release: 3%{?dist} +Version: 3.33.90.1 +Release: 1%{?dist} Summary: Application for taking pictures and movies from a webcam License: GPLv2+ URL: https://wiki.gnome.org/Apps/Cheese Source0: https://download.gnome.org/sources/%{name}/3.32/%{name}-%{version}.tar.xz +BuildRequires: gcc +BuildRequires: meson +BuildRequires: gtk-doc BuildRequires: chrpath BuildRequires: desktop-file-utils BuildRequires: docbook-dtds BuildRequires: docbook-style-xsl BuildRequires: gettext -BuildRequires: intltool BuildRequires: itstool BuildRequires: libXtst-devel BuildRequires: vala @@ -63,16 +65,16 @@ for writing applications that require a webcam display widget. %prep -%setup -q +%autosetup %build -%configure --disable-static -make V=1 %{?_smp_mflags} +%meson -Dtests=false +%meson_build %install -%make_install +%meson_install rm -f %{buildroot}%{_libdir}/libcheese.{a,la} rm -f %{buildroot}%{_libdir}/libcheese-gtk.{a,la} @@ -85,7 +87,7 @@ chrpath --delete %{buildroot}%{_libdir}/libcheese-gtk.so.* %check desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Cheese.desktop - +%meson_test %ldconfig_scriptlets libs @@ -94,7 +96,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Cheese.desk %doc AUTHORS README %{_bindir}/cheese %{_datadir}/applications/org.gnome.Cheese.desktop -%{_datadir}/appdata/org.gnome.Cheese.appdata.xml +%{_datadir}/metainfo/org.gnome.Cheese.appdata.xml %{_datadir}/dbus-1/services/org.gnome.Cheese.service %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Cheese.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Cheese-symbolic.svg @@ -118,6 +120,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Cheese.desk %changelog +* Tue Aug 06 2019 Phil Wyett - 2:3.33.90.1-1 +- Convert to using meson build system. +- Update to 3.33.90.1. + * Wed Jul 24 2019 Fedora Release Engineering - 2:3.32.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index ceacf5f..4225a36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cheese-3.32.1.tar.xz) = bdd0ae72e3df596d19ad467dc0222a49b028f2ad8c285d55360813624ca2dac1956463cfd9cea4f2a6ff123070966544cd7254ee2891e973dca42d07061a6c94 +SHA512 (cheese-3.33.90.1.tar.xz) = 9c2a8bb9660fec21cb8932c8ee4caae21a02a220e5816afc33f866fb47a0f07fb0c1d57be54cdf44dffde6e777b7ff0959db34fd51e266b3a23b30c8b5f817b2