SPECS: eog.spec - merged from DEVEL

megabajt megabajt at pld-linux.org
Sat Oct 4 14:36:37 CEST 2008 

Author: megabajt                     Date: Sat Oct  4 12:36:37 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   eog.spec (1.116 -> 1.117) 

---- Diffs:

================================================================
Index: SPECS/eog.spec
diff -u SPECS/eog.spec:1.116 SPECS/eog.spec:1.117
--- SPECS/eog.spec:1.116	Fri Oct  3 19:42:49 2008
+++ SPECS/eog.spec	Sat Oct  4 14:36:31 2008
@@ -1,35 +1,39 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	apidocs		# disable API documentation
+#
 Summary:	The Eye of GNOME image viewer
 Summary(pl.UTF-8):	Oko GNOME - przeglądarka obrazków
 Summary(pt_BR.UTF-8):	Visualizador de imagem Eye of GNOME
 Name:		eog
-Version:	2.22.3
-Release:	2
+Version:	2.24.0
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Graphics
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/eog/2.22/%{name}-%{version}.tar.bz2
-# Source0-md5:	f1ca295b0ebf800cab17fc166e37588e
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/eog/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5:	9a8cb17555df81980ac0492715a195e3
 Patch0:		%{name}-codegen.patch
-Patch1:		%{name}-desktop.patch
 URL:		http://www.gnome.org/projects/eog/
-BuildRequires:	GConf2-devel >= 2.22.0
+BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.74
 BuildRequires:	exempi-devel >= 1.99.5
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-desktop-devel >= 2.22.0
-BuildRequires:	gnome-doc-utils >= 0.12.0
-BuildRequires:	gnome-icon-theme >= 2.20.0
-BuildRequires:	gnome-vfs2-devel >= 2.22.0
-BuildRequires:	gtk+2-devel >= 2:2.12.5
-BuildRequires:	intltool >= 0.37.0
+BuildRequires:	gnome-common >= 2.24.0
+BuildRequires:	gnome-desktop-devel >= 2.24.0
+BuildRequires:	gnome-doc-utils >= 0.14.0
+BuildRequires:	gnome-icon-theme >= 2.24.0
+BuildRequires:	gnome-vfs2-devel >= 2.24.0
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
+BuildRequires:	gtk+2-devel >= 2:2.14.0
+BuildRequires:	intltool >= 0.40.0
 BuildRequires:	lcms-devel
 BuildRequires:	libart_lgpl-devel >= 2.3.19
 BuildRequires:	libexif-devel >= 1:0.6.14
 BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.22.0
+BuildRequires:	libgnomeui-devel >= 2.24.0
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 0.9.0
@@ -37,13 +41,13 @@
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
 BuildRequires:	sed >= 4.0
-BuildRequires:	shared-mime-info >= 0.20
+BuildRequires:	shared-mime-info >= 0.50
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
-Requires:	libgnomeui >= 2.22.0
+Requires:	libgnomeui >= 2.24.0
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -63,11 +67,11 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe eog
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	GConf2-devel >= 2.22.0
-Requires:	gnome-vfs2-devel >= 2.22.0
-Requires:	gtk+2-devel >= 2:2.12.5
+Requires:	GConf2-devel >= 2.24.0
+Requires:	gnome-vfs2-devel >= 2.24.0
+Requires:	gtk+2-devel >= 2:2.14.0
 Requires:	libglade2-devel >= 1:2.6.2
-Requires:	libgnomeui-devel >= 2.22.0
+Requires:	libgnomeui-devel >= 2.24.0
 
 %description devel
 Header files for eog.
@@ -75,15 +79,24 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe eog.
 
+%package apidocs
+Summary:	Eye of GNOME API documentation
+Summary(pl.UTF-8):	Dokumentacja API Eye of GNOME
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+Eye of GNOME API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API Eye of GNOME.
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-%{__sed} -i -e "s#sr at Latn#sr at latin#" po/LINGUAS
-mv po/sr@{Latn,latin}.po
 
 %build
+%{?with_apidocs:%{__gtkdocize}}
 %{__gnome_doc_common}
 %{__libtoolize}
 %{__intltoolize}
@@ -92,8 +105,10 @@
 %{__autoheader}
 %{__autoconf}
 %configure \
+	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
 	--disable-schemas-install \
-	--disable-scrollkeeper
+	--disable-scrollkeeper \
+	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
@@ -103,6 +118,8 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/eog/plugins/*.la
+
 %find_lang %{name} --with-gnome --with-omf
 
 %clean
@@ -129,6 +146,15 @@
 %{_sysconfdir}/gconf/schemas/eog.schemas
 %{_datadir}/%{name}
 %{_desktopdir}/eog.desktop
+%dir %{_libdir}/eog
+%dir %{_libdir}/eog/plugins
+# buggy soname generation, uses .so.0.0.0
+%{_libdir}/eog/plugins/fullscreen.eog-plugin
+%attr(755,root,root) %{_libdir}/eog/plugins/libfullscreen.so*
+%{_libdir}/eog/plugins/reload.eog-plugin
+%attr(755,root,root) %{_libdir}/eog/plugins/libreload.so*
+%{_libdir}/eog/plugins/statusbar-date.eog-plugin
+%attr(755,root,root) %{_libdir}/eog/plugins/libstatusbar-date.so*
 %{_iconsdir}/hicolor/*/*/*
 
 %files devel
@@ -136,21 +162,64 @@
 %{_includedir}/eog-2.20
 %{_pkgconfigdir}/eog.pc
 
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/eog
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.117  2008/10/04 12:36:31  megabajt
+- merged from DEVEL
+
 Revision 1.116  2008/10/03 17:42:49  arekm
 - release 2
 
+Revision 1.113.2.11  2008/09/27 20:40:20  qwiat
+- up to 2.24
+
+Revision 1.113.2.10  2008/09/12 20:42:58  patrys
+- 2.23.92
+- dropped desktop patch (RasterGraphics is a perfectly fine category)
+
+Revision 1.113.2.9  2008/09/03 22:25:03  patrys
+- 2.23.91
+
+Revision 1.113.2.8  2008/08/21 22:43:12  patrys
+- updated BR
+
+Revision 1.113.2.7  2008/08/19 12:50:06  patrys
+- 2.23.90
+
+Revision 1.113.2.6  2008/08/05 19:32:48  patrys
+- 2.23.6
+
+Revision 1.113.2.5  2008/07/23 13:03:12  patrys
+- 2.23.5
+
 Revision 1.115  2008/07/06 11:14:13  megabajt
 - updated to 2.22.3
 
+Revision 1.113.2.4  2008/06/17 20:05:18  patrys
+- 2.23.4.1
+
+Revision 1.113.2.3  2008-06-04 12:17:13  patrys
+- use new gnome-desktop
+
+Revision 1.113.2.2  2008-06-03 21:09:52  patrys
+- 2.23.3
+
 Revision 1.114  2008/05/28 15:57:16  megabajt
 - updated to 2.22.2
 - Group changed to X11/Applications/Graphics
+
+Revision 1.113.2.1  2008-05-14 11:20:03  patrys
+- 2.23.2
 
 Revision 1.113  2008-04-11 19:49:46  sls
 - ver. 2.22.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/eog.spec?r1=1.116&r2=1.117&f=u

More information about the pld-cvs-commit mailing list