Author: patrys                       Date: Tue Mar 11 14:48:19 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.22.0
- merged from DEVEL

---- Files affected:
SPECS:
   gnome-desktop.spec (1.117 -> 1.118) 

---- Diffs:

================================================================
Index: SPECS/gnome-desktop.spec
diff -u SPECS/gnome-desktop.spec:1.117 SPECS/gnome-desktop.spec:1.118
--- SPECS/gnome-desktop.spec:1.117      Wed Jan  9 20:38:36 2008
+++ SPECS/gnome-desktop.spec    Tue Mar 11 15:48:13 2008
@@ -1,27 +1,29 @@
-# $Revision$, $Date$
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl.UTF-8):     Podstawowe programy środowiska graficznego GNOME
 Name:          gnome-desktop
-Version:       2.20.3
+Version:       2.22.0
 Release:       1
 License:       LGPL
 Group:         X11/Applications
-Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5: d59ddca5e9bc4e4d1717538ceae57501
+Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5: 452d4ee91b3c54aac4282f3f1e3b68f0
 Source1:       pld-logo.svg
 Patch0:                %{name}-crystalsvg.patch
 Patch1:                %{name}-recently-used-apps.patch
 URL:           http://www.gnome.org/
+BuildRequires: GConf2-devel >= 2.22.0
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.9
+BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.16.0
 BuildRequires: gnome-common >= 2.20.0
 BuildRequires: gnome-doc-utils >= 0.12.0
-BuildRequires: gnome-vfs2-devel >= 2.20.0
-BuildRequires: gtk+2-devel >= 2:2.12.0
+BuildRequires: gtk+2-devel >= 2:2.12.5
 BuildRequires: gtk-doc >= 1.8
 BuildRequires: intltool >= 0.36.1
-BuildRequires: libgnomeui-devel >= 2.20.0
+BuildRequires: libgnomeui-devel >= 2.22.0
 BuildRequires: libtool
+BuildRequires: libxml2-devel >= 1:2.6.31
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
@@ -55,8 +57,8 @@
 %package libs
 Summary:       gnome-desktop library
 Summary(pl.UTF-8):     Biblioteka gnome-desktop
-Group:         Development/Libraries
-Requires:      libgnomeui >= 2.20.0
+Group:         X11/Libraries
+Requires:      libgnomeui >= 2.22.0
 
 %description libs
 This package contains gnome-desktop library.
@@ -69,7 +71,7 @@
 Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek GNOME desktop
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      libgnomeui-devel >= 2.20.0
+Requires:      libgnomeui-devel >= 2.22.0
 Requires:      startup-notification-devel >= 0.8
 
 %description devel
@@ -107,8 +109,8 @@
 %patch0 -p1
 %patch1 -p1
 
-sed -i -e '[EMAIL PROTECTED]@latin#' po/LINGUAS
-mv po/[EMAIL PROTECTED],latin}.po
+sed -i -e '[EMAIL PROTECTED]@latin#' po/LINGUAS
+mv po/[EMAIL PROTECTED],latin}.po
 
 %build
 %{__gtkdocize}
@@ -161,6 +163,7 @@
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnome-desktop-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnome-desktop-2.so.2
 
 %files devel
 %defattr(644,root,root,755)
@@ -183,9 +186,38 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.118  2008-03-11 14:48:13  patrys
+- 2.22.0
+- merged from DEVEL
+
+
+Revision 1.116.2.7  2008-03-11 14:45:18  patrys
+- 2.22.0
+- patch2 applied upstream
+
+Revision 1.116.2.6  2008-02-15 14:36:41  megabajt
+- added -bugfix.patch
+- release 2
+
+Revision 1.116.2.5  2008-02-11 19:29:58  megabajt
+- updated to 2.21.91
+
+Revision 1.116.2.4  2008-01-28 14:17:25  megabajt
+- updated to 2.21.90
+
+Revision 1.116.2.3  2008-01-15 15:25:49  patrys
+- 2.21.5
+
 Revision 1.117  2008-01-09 19:38:36  megabajt
 - updated to 2.20.3
 
+Revision 1.116.2.2  2007-12-25 10:59:29  megabajt
+- updated deps
+
+Revision 1.116.2.1  2007-12-20 02:04:06  patrys
+- 2.21.4
+
+>>>>>>> 1.116.2.7
 Revision 1.116  2007-11-27 20:15:04  megabajt
 - updated to 2.20.2
 - use better way to fix locale name
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to