Author: paladine                     Date: Wed Mar  9 23:27:05 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   gnome-panel.spec (1.156 -> 1.157) 

---- Diffs:

================================================================
Index: SPECS/gnome-panel.spec
diff -u SPECS/gnome-panel.spec:1.156 SPECS/gnome-panel.spec:1.157
--- SPECS/gnome-panel.spec:1.156        Mon Feb 14 23:35:18 2005
+++ SPECS/gnome-panel.spec      Thu Mar 10 00:27:00 2005
@@ -6,52 +6,49 @@
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl):   Podstawowe programy środowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.8.3
+Version:       2.10.0
 Release:       1
 License:       LGPL
 Group:         X11/Applications
-Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.8/%{name}-%{version}.tar.bz2
-# Source0-md5: d76a09c321e02c18e0fdecb86677550d
+Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.10/%{name}-%{version}.tar.bz2
+# Source0-md5: 398e95097aeb7b8be2b6b47a0f9affe0
 Source1:       pld-desktop-stripe.png
 # Source1-md5: 4b8b299a8aa7b95a606e7c4d8debd60c
 Patch0:                %{name}-no_launchers_on_panel.patch
 Patch1:                %{name}-finalize-memleak.patch
 %{?with_menu_stripe:Patch2:            %{name}-menu-stripe.patch}
 Patch3:                %{name}-notification_area_applet.patch
-Patch4:                %{name}-all_applications.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.8.0.1
-BuildRequires: ORBit2-devel >= 1:2.11.2
+BuildRequires: GConf2-devel >= 2.10.0
+BuildRequires: ORBit2-devel >= 1:2.12.1
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: evolution-data-server-devel >= 1.0.1
+BuildRequires: evolution-data-server-devel >= 1.2.0
 BuildRequires: gnome-common >= 2.8.0-2
-BuildRequires: gnome-desktop-devel >= 2.8.0
-BuildRequires: gnome-vfs2-devel >= 2.8.1
-BuildRequires: gtk+2-devel >= 2:2.4.4
+BuildRequires: gnome-desktop-devel >= 2.10.0
+BuildRequires: gnome-menus-devel >= 2.10.0
+BuildRequires: gnome-vfs2-devel >= 2.10.0
+BuildRequires: gtk+2-devel >= 2:2.6.2
 BuildRequires: gtk-doc >= 1.1
 BuildRequires: intltool >= 0.31
 BuildRequires: libart_lgpl-devel >= 2.3.15
-BuildRequires: libglade2-devel >= 1:2.4.0
-BuildRequires: libgnomeui-devel >= 2.8.0
-BuildRequires: libpng-devel >= 1.2.0
+BuildRequires: libglade2-devel >= 1:2.5.0
+BuildRequires: libgnomeui-devel >= 2.10.0
 BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.8.0.1
-BuildRequires: pango-devel >= 1:1.6.0
+BuildRequires: libwnck-devel >= 2.10.0
+BuildRequires: pango-devel >= 1:1.8.0
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.15.0
 BuildRequires: rpm-build >= 4.1-10
 BuildRequires: scrollkeeper >= 0.3.11
-BuildRequires: zlib-devel
 BuildConflicts:        GConf-devel < 1.0.9-7
 Requires(post,postun): /sbin/ldconfig
 Requires(post,postun): scrollkeeper
-Requires(post):        GConf2 >= 2.8.0
-Requires:      gnome-desktop >= 2.8.0
-Requires:      gnome-icon-theme >= 2.8.0
-Requires:      gnome-vfs-menu-module
-Requires:      libgnomeui >= 2.8.0
-Requires:      librsvg >= 1:2.8.1
+Requires(post):        GConf2 >= 2.10.0
+Requires:      gnome-desktop >= 2.10.0
+Requires:      gnome-icon-theme >= 2.10.0
+Requires:      libgnomeui >= 2.10.0
+Requires:      librsvg >= 1:2.9.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -78,7 +75,7 @@
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      gtk-doc-common
-Requires:      libgnomeui-devel >= 2.8.0
+Requires:      libgnomeui-devel >= 2.10.0
 
 %description devel
 Panel header files for creating GNOME panels.
@@ -104,7 +101,6 @@
 %patch1 -p1
 %{?with_menu_stripe:%patch2 -p1}
 %patch3 -p1
-%patch4 -p1
 
 %build
 cp /usr/share/gnome-common/data/omf.make .
@@ -120,11 +116,11 @@
        --with-html-dir=%{_gtkdocdir} \
        --enable-eds \
        --disable-schemas-install
-
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_datadir}/%{name}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -176,6 +172,7 @@
 %{_datadir}/gnome-panelrc
 %{_datadir}/idl/gnome-panel-2.0
 %{_pixmapsdir}/*
+%{_iconsdir}/*/*/apps/*.png
 %{_omf_dest_dir}/%{name}
 %{_mandir}/man1/*
 
@@ -197,8 +194,35 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.157  2005/03/09 23:27:00  paladine
+- merged from DEVEL
+
 Revision 1.156  2005/02/14 22:35:18  paladine
 - updated to 2.8.3
+
+Revision 1.155.2.7  2005/03/07 21:27:06  wiget
+- updated to 2.10.0
+
+Revision 1.155.2.6  2005/03/01 12:25:48  aflinta
+- cleanup
+
+Revision 1.155.2.5  2005/03/01 12:25:23  aflinta
+- up to version 2.9.92
+
+Revision 1.155.2.4  2005/02/28 21:56:33  paladine
+- added patch fixing usage of wnck_workspace_activate with libwnck > 2.9.91
+- rel. 2
+
+Revision 1.155.2.3  2005/02/13 18:52:43  grzegol
+- all_applications patch is outdated
+- gnome-vfs-menu-module isn't needed
+- rel. 1
+
+Revision 1.155.2.2  2005/02/08 13:55:49  grzegol
+- updated to 2.9.91
+
+Revision 1.155.2.1  2005/02/07 17:01:30  grzegol
+- updated to 2.9.90
 
 Revision 1.155  2004/12/06 19:08:42  freetz
 - added incidentally omited changelog entry
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-panel.spec?r1=1.156&r2=1.157&f=u


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

Reply via email to