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

diff --git a/cheese.spec b/cheese.spec
index f9c12b5..866f3a1 100644
--- a/cheese.spec
+++ b/cheese.spec
@@ -1,45 +1,61 @@
+#
+# 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:	2.30.1
-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/2.30/%{name}-%{version}.tar.bz2
-# Source0-md5:	1599fded8a1797ea51fb010af4e6c45b
-URL:		http://live.gnome.org/Cheese
-BuildRequires:	GConf2-devel >= 2.24.0
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.74
+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:	evolution-data-server-devel >= 2.24.0
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.18.0
-BuildRequires:	gnome-common >= 2.24.0
-BuildRequires:	gnome-desktop-devel >= 2.26.0
-BuildRequires:	gnome-doc-utils >= 0.14.0
-BuildRequires:	gstreamer-devel >= 0.10.23
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10.23
-BuildRequires:	gtk+2-devel >= 2:2.20.0
-BuildRequires:	gtk-doc
-BuildRequires:	gtk-doc-automake >= 1.11
-BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libcanberra-gtk-devel
-BuildRequires:	librsvg-devel >= 2.18.2
-BuildRequires:	libtool
-BuildRequires:	pkgconfig
+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-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
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.14}
+BuildRequires:	itstool
+BuildRequires:	libcanberra-gtk3-devel >= 0.26
+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.311
-BuildRequires:	udev-glib-devel
-BuildRequires:	xorg-lib-libXxf86vm-devel
-Requires(post,postun):	gtk+2
-Requires(post,postun):	hicolor-icon-theme
-Requires(post,postun):	scrollkeeper
-Requires(post,preun):	GConf2
-Requires:	gstreamer-theora >= 0.10.23
-Requires:	gstreamer-vorbis >= 0.10.23
-Requires:	gtk+2 >= 2:2.20.0
+BuildRequires:	rpmbuild(macros) >= 1.736
+BuildRequires:	tar >= 1:1.22
+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.40.0
+Requires(post,postun):	gtk-update-icon-cache
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	gnome-video-effects
+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-vpx
+Requires:	hicolor-icon-theme >= 0.15
+Suggests:	nautilus-sendto >= 3.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,14 +68,37 @@ Cheese to program do pobierania zdjęć i filmów z kamery internetowej.
 Udostępnia także kilka graficznych efektów w celu zaspokojenia
 instynktów oglądania u użytkowników.
 
+%package libs
+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.
+
+%description libs -l pl.UTF-8
+Biblioteki Cheese.
+
 %package devel
 Summary:	Cheese header files
 Summary(pl.UTF-8):	Pliki nagłówkowe Cheese
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	gstreamer-plugins-base-devel >= 0.10.23
-Requires:	gtk+2-devel >= 2:2.20.0
-Requires:	libcanberra-gtk-devel
+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:	gtk+3-devel >= 3.13.4
+Requires:	libcanberra-gtk3-devel >= 0.26
 
 %description devel
 Cheese header files.
@@ -72,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.
@@ -81,71 +123,65 @@ Dokumentacja API Cheese.
 
 %prep
 %setup -q
-sed -i 's#^en@shaw##' po/LINGUAS
-rm po/en@shaw.po
 
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-schemas-install \
-	--disable-scrollkeeper \
-	--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
+%ninja_install -C build
 
-%find_lang %{name} --with-gnome --with-omf
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 %update_icon_cache hicolor
-%gconf_schema_install cheese.schemas
-%scrollkeeper_update_post
-
-%preun
-%gconf_schema_uninstall cheese.schemas
+%glib_compile_schemas
 
 %postun
-/sbin/ldconfig
 %update_icon_cache hicolor
-%scrollkeeper_update_postun
+%glib_compile_schemas
+
+%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
-%attr(755,root,root) %{_libdir}/libcheese-gtk.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcheese-gtk.so.18
-%dir %{_libdir}/cheese
-%attr(755,root,root) %{_libdir}/cheese/cheese-bugreport.sh
-%{_sysconfdir}/gconf/schemas/cheese.schemas
-%{_desktopdir}/cheese.desktop
-%{_datadir}/cheese
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
-%{_iconsdir}/hicolor/*/apps/*
+%{_datadir}/glib-2.0/schemas/org.gnome.Cheese.gschema.xml
+%{_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.25
+%attr(755,root,root) %{_libdir}/libcheese.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcheese.so.8
+%{_libdir}/girepository-1.0/Cheese-3.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcheese-gtk.so
-%{_libdir}/libcheese-gtk.la
+%attr(755,root,root) %{_libdir}/libcheese.so
+%{_datadir}/gir-1.0/Cheese-3.0.gir
 %{_includedir}/cheese
 %{_pkgconfigdir}/cheese-gtk.pc
+%{_pkgconfigdir}/cheese.pc
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/cheese
+%endif