X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cheese.spec;h=866f3a154f0930dab38e9fd214cced676870c7ca;hb=6dc4c3fb1542cd8b24615bd475721925e37d3536;hp=260a3947ccd88b194262613e1bafa51bed4d1018;hpb=3bd2266310f4b42f3afa1185235ae70db99f9634;p=packages%2Fcheese.git

diff --git a/cheese.spec b/cheese.spec
index 260a394..866f3a1 100644
--- a/cheese.spec
+++ b/cheese.spec
@@ -1,59 +1,60 @@
+#
+# 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.6.0
-Release:	1
-License:	GPL
+Version:	3.34.0
+Release:	2
+License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/cheese/3.6/%{name}-%{version}.tar.xz
-# Source0-md5:	2c209be1523090841f1270959a72108b
-URL:		http://projects.gnome.org/cheese/
-BuildRequires:	autoconf >= 2.64
-BuildRequires:	automake >= 1:1.11
-BuildRequires:	cairo-devel >= 1.10.0
-BuildRequires:	clutter-devel >= 1.10.0
-BuildRequires:	clutter-gst-devel >= 1.9.0
-BuildRequires:	clutter-gtk-devel >= 0.91.8
+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:	clutter-devel >= 1.14.0
+BuildRequires:	clutter-gst-devel >= 3.0.0
+BuildRequires:	clutter-gtk-devel >= 1.0
+BuildRequires:	dbus-devel
 BuildRequires:	docbook-dtd43-xml
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.28.0
-BuildRequires:	gnome-common >= 2.24.0
+BuildRequires:	docbook-style-xsl
+BuildRequires:	gdk-pixbuf2-devel >= 2.0
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.40.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.0.0
+BuildRequires:	gstreamer-plugins-bad-devel >= 1.4.0
 BuildRequires:	gstreamer-plugins-base-devel >= 1.0.0
-BuildRequires:	gtk+3-devel >= 3.4.4
-BuildRequires:	gtk-doc >= 1.14
-BuildRequires:	gtk-doc-automake >= 1.14
-BuildRequires:	intltool >= 0.50.0
+BuildRequires:	gtk+3-devel >= 3.13.4
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.14}
 BuildRequires:	itstool
 BuildRequires:	libcanberra-gtk3-devel >= 0.26
-BuildRequires:	libgee-devel >= 0.6.0
-BuildRequires:	librsvg-devel >= 2.32.0
-BuildRequires:	libtool >= 2:2.2
-BuildRequires:	pango-devel >= 1.28.0
-BuildRequires:	pkgconfig >= 0.24
+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:	udev-glib-devel
-BuildRequires:	vala >= 2:0.14.0
-BuildRequires:	xorg-lib-libXxf86vm-devel
+BuildRequires:	vala >= 2:0.25.2
+BuildRequires:	vala-libcanberra >= 0.26
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	xz
 BuildRequires:	yelp-tools
-Requires(post,postun):	glib2 >= 1:2.26.0
+Requires(post,postun):	glib2 >= 1:2.40.0
 Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	gnome-video-effects
-Requires:	gstreamer-plugins-bad
+Requires:	gstreamer-plugins-bad >= 1.4.0
 Requires:	gstreamer-plugins-good
 Requires:	gstreamer-theora >= 1.0.0
 Requires:	gstreamer-vorbis >= 1.0.0
-Requires:	gstreamer-vp8
-Requires:	hicolor-icon-theme
+Requires:	gstreamer-vpx
+Requires:	hicolor-icon-theme >= 0.15
 Suggests:	nautilus-sendto >= 3.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -71,6 +72,12 @@ instynktów oglądania u użytkowników.
 Summary:	Cheese libraries
 Summary(pl.UTF-8):	Biblioteki Cheese
 Group:		X11/Libraries
+Requires:	clutter >= 1.14.0
+Requires:	clutter-gst >= 3.0.0
+Requires:	clutter-gtk >= 1.0
+Requires:	glib2 >= 1:2.40.0
+Requires:	gtk+3 >= 3.13.4
+Requires:	libcanberra-gtk3 >= 0.26
 
 %description libs
 Cheese libraries.
@@ -83,9 +90,14 @@ Summary:	Cheese header files
 Summary(pl.UTF-8):	Pliki nagłówkowe Cheese
 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 >= 1.0
+Requires:	glib2-devel >= 1:2.40.0
+Requires:	gstreamer-devel >= 1.0.0
+Requires:	gstreamer-plugins-bad-devel >= 1.4.0
 Requires:	gstreamer-plugins-base-devel >= 1.0.0
-Requires:	gstreamer-plugins-bad-devel >= 1.0.0
-Requires:	gtk+3-devel >= 3.4.4
+Requires:	gtk+3-devel >= 3.13.4
 Requires:	libcanberra-gtk3-devel >= 0.26
 
 %description devel
@@ -99,6 +111,9 @@ Summary:	Cheese API documentation
 Summary(pl.UTF-8):	Dokumentacja API Cheese
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 Cheese API documentation.
@@ -110,27 +125,15 @@ Dokumentacja API Cheese.
 %setup -q
 
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-schemas-compile \
-	--disable-silent-rules \
-	--disable-static \
-	--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
 
@@ -145,26 +148,27 @@ rm -rf $RPM_BUILD_ROOT
 %update_icon_cache hicolor
 %glib_compile_schemas
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/cheese
-%{_desktopdir}/cheese.desktop
-%{_datadir}/cheese
+%{_datadir}/dbus-1/services/org.gnome.Cheese.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Cheese.gschema.xml
-%{_iconsdir}/hicolor/*/*/*.png
-%{_iconsdir}/hicolor/*/*/*.svg
+%{_datadir}/metainfo/org.gnome.Cheese.appdata.xml
+%{_desktopdir}/org.gnome.Cheese.desktop
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Cheese.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.Cheese-symbolic.svg
 %{_mandir}/man1/cheese.1*
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcheese-gtk.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcheese-gtk.so.23
+%attr(755,root,root) %ghost %{_libdir}/libcheese-gtk.so.25
 %attr(755,root,root) %{_libdir}/libcheese.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcheese.so.7
+%attr(755,root,root) %ghost %{_libdir}/libcheese.so.8
 %{_libdir}/girepository-1.0/Cheese-3.0.typelib
 
 %files devel
@@ -176,6 +180,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