SPECS: gnome-desktop.spec - merged from DEVEL and updated to 2.12.0

[freetz]

Author: freetz                       Date: Mon Sep  5 17:51:53 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL and updated to 2.12.0

---- Files affected:
SPECS:
   gnome-desktop.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: SPECS/gnome-desktop.spec
diff -u SPECS/gnome-desktop.spec:1.83 SPECS/gnome-desktop.spec:1.84
--- SPECS/gnome-desktop.spec:1.83	Tue Jun 28 22:09:26 2005
+++ SPECS/gnome-desktop.spec	Mon Sep  5 19:51:48 2005
@@ -1,15 +1,13 @@
 # $Revision$, $Date$
-# TODO:
-# play with --with-kde-datadir
 Summary:	The core programs for the GNOME2 GUI desktop environment
 Summary(pl):	Podstawowe programy środowiska graficznego GNOME2
 Name:		gnome-desktop
-Version:	2.10.2
+Version:	2.12.0
 Release:	1
 License:	LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.10/%{name}-%{version}.tar.bz2
-# Source0-md5:	b912a6878ea307af9e3d015864ec0678
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.12/%{name}-%{version}.tar.bz2
+# Source0-md5:	51c217ea85ed1ccc7e9bf42ea2636ebf
 Source1:	pld-logo.svg
 # Source1-md5:	9fda4ca70a6e8e82e8e5bebe0e28db74
 Patch0:		%{name}-crystalsvg.patch
@@ -18,8 +16,9 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gnome-common >= 2.8.0
-BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
-BuildRequires:	gtk+2-devel >= 2:2.6.4
+BuildRequires:	gnome-doc-utils >= 0.3.1-2
+BuildRequires:	gnome-vfs2-devel >= 2.11.90
+BuildRequires:	gtk+2-devel >= 2:2.8.0
 BuildRequires:	libgnomeui-devel >= 2.10.0-2
 BuildRequires:	libtool
 BuildRequires:	rpmbuild(macros) >= 1.197
@@ -82,6 +81,7 @@
 %patch1 -p1
 
 %build
+gnome-doc-prepare --copy --force
 %{__gnome_doc_common}
 %{__libtoolize}
 %{__aclocal}
@@ -124,7 +124,10 @@
 %doc %{_mandir}/man1/*
 %{_datadir}/gnome-about
 %{_pixmapsdir}/*
-%{_omf_dest_dir}/%{name}
+%{_omf_dest_dir}/fdl
+%{_omf_dest_dir}/gnome-feedback
+%{_omf_dest_dir}/gpl
+%{_omf_dest_dir}/lgpl
 %{_desktopdir}/*.desktop
 
 %files devel
@@ -144,6 +147,24 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2005/09/05 17:51:48  freetz
+- merged from DEVEL and updated to 2.12.0
+
+Revision 1.83.2.5  2005/08/22 19:21:13  aflinta
+- version 2.11.92
+
+Revision 1.83.2.4  2005/08/17 20:37:59  aflinta
+- rebuild with new cairo, rel. 2
+
+Revision 1.83.2.3  2005/07/25 19:05:26  freetz
+- 2.11.90, switched to gnome-doc-utils
+
+Revision 1.83.2.2  2005/07/13 11:13:37  freetz
+- 2.11.5
+
+Revision 1.83.2.1  2005/07/03 15:49:28  freetz
+- 2.11.4
+
 Revision 1.83  2005/06/28 20:09:26  freetz
 - 2.10.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-desktop.spec?r1=1.83&r2=1.84&f=u