- updated to 3.34.0

diff --git a/cheese.spec b/cheese.spec
index 817c27b579865b5ae6d7f350bac7c7fd88732bee..00c3c0920a6f2dca8e269fcfec8ee06068a87bad 100644 (file)
--- a/cheese.spec
+++ b/cheese.spec
@@ -1,43 +1,43 @@
+#
+# Conditional build:
+%bcond_without apidocs         # API documentation
+
 Summary:       A cheesy program to take pictures and videos from your web cam
 Summary(pl.UTF-8):     Program do pobierania zdjęć i filmów z kamery internetowej
 Name:          cheese
-Version:       3.32.1
+Version:       3.34.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/cheese/3.32/%{name}-%{version}.tar.xz
-# Source0-md5: 3f8128c13c3ecf0580fc0069a1573480
-URL:           http://projects.gnome.org/cheese/
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/cheese/3.34/%{name}-%{version}.tar.xz
+# Source0-md5: 13f8326689df42b0aedda023705db803
+URL:           https://wiki.gnome.org/Apps/Cheese
 BuildRequires: appstream-glib-devel
-BuildRequires: autoconf >= 2.64
-BuildRequires: automake >= 1:1.12
 BuildRequires: clutter-devel >= 1.14.0
 BuildRequires: clutter-gst-devel >= 3.0.0
-BuildRequires: clutter-gtk-devel >= 0.91.8
+BuildRequires: clutter-gtk-devel >= 1.0
+BuildRequires: dbus-devel
 BuildRequires: docbook-dtd43-xml
 BuildRequires: docbook-style-xsl
 BuildRequires: gdk-pixbuf2-devel >= 2.0
 BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.40.0
-BuildRequires: gnome-common >= 2.24.0
 BuildRequires: gnome-desktop-devel >= 3.0.0
-BuildRequires: gnome-doc-utils >= 0.20.0
 BuildRequires: gnome-video-effects
 BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: gstreamer-devel >= 1.0.0
 BuildRequires: gstreamer-plugins-bad-devel >= 1.4.0
 BuildRequires: gstreamer-plugins-base-devel >= 1.0.0
 BuildRequires: gtk+3-devel >= 3.13.4
-BuildRequires: gtk-doc >= 1.14
-BuildRequires: gtk-doc-automake >= 1.14
-BuildRequires: intltool >= 0.50.0
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.14}
 BuildRequires: itstool
 BuildRequires: libcanberra-gtk3-devel >= 0.26
-BuildRequires: libtool >= 2:2.2
 BuildRequires: libxslt-progs
+BuildRequires: meson >= 0.50.0
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig >= 1:0.24
 BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.601
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: tar >= 1:1.22
 BuildRequires: vala >= 2:0.25.2
 BuildRequires: xorg-lib-libX11-devel
@@ -73,7 +73,7 @@ Summary(pl.UTF-8):    Biblioteki Cheese
 Group:         X11/Libraries
 Requires:      clutter >= 1.14.0
 Requires:      clutter-gst >= 3.0.0
-Requires:      clutter-gtk >= 0.91.8
+Requires:      clutter-gtk >= 1.0
 Requires:      glib2 >= 1:2.40.0
 Requires:      gtk+3 >= 3.13.4
 Requires:      libcanberra-gtk3 >= 0.26
@@ -91,7 +91,7 @@ Group:                X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      clutter-devel >= 1.14.0
 Requires:      clutter-gst-devel >= 3.0.0
-Requires:      clutter-gtk-devel >= 0.91.8
+Requires:      clutter-gtk-devel >= 1.0
 Requires:      glib2-devel >= 1:2.40.0
 Requires:      gstreamer-devel >= 1.0.0
 Requires:      gstreamer-plugins-bad-devel >= 1.4.0
@@ -124,26 +124,15 @@ Dokumentacja API Cheese.
 %setup -q
 
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       --disable-schemas-compile \
-       --disable-silent-rules \
-       --enable-gtk-doc \
-       --with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build \
+       %{!?with_apidocs:-Dgtk_doc=false}
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%ninja_install -C build
 
 %find_lang %{name} --with-gnome
 
@@ -190,6 +179,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/cheese-gtk.pc
 %{_pkgconfigdir}/cheese.pc
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/cheese
+%endif