Author: freetz Date: Sun Apr 2 06:59:42 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SPECS:
gnome-panel.spec (1.172 -> 1.173) , libwnck.spec (1.53 -> 1.54)
---- Diffs:
================================================================
Index: SPECS/gnome-panel.spec
diff -u SPECS/gnome-panel.spec:1.172 SPECS/gnome-panel.spec:1.173
--- SPECS/gnome-panel.spec:1.172 Wed Feb 8 17:05:38 2006
+++ SPECS/gnome-panel.spec Sun Apr 2 08:59:37 2006
@@ -2,15 +2,14 @@
Summary: The core programs for the GNOME GUI desktop environment
Summary(pl): Podstawowe programy środowiska graficznego GNOME
Name: gnome-panel
-Version: 2.12.3
-Release: 1
+Version: 2.14.0
+Release: 3
License: LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 50a27090f7c667536e4bb5b077428853
+Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 85a2815aefd7d3c3acf93c588149b75b
Patch0: %{name}-finalize-memleak.patch
-Patch1: %{name}-no_mixer_applet.patch
-Patch2: %{name}-no_launchers_on_panel.patch
+Patch1: %{name}-no_launchers_on_panel.patch
URL: http://www.gnome.org/
BuildRequires: GConf2-devel >= 2.12.0
BuildRequires: ORBit2-devel >= 1:2.12.3
@@ -27,9 +26,9 @@
BuildRequires: intltool >= 0.31
BuildRequires: libart_lgpl-devel >= 2.3.15
BuildRequires: libglade2-devel >= 1:2.5.0
-BuildRequires: libgnomeui-devel >= 2.12.0
+BuildRequires: libgnomeui-devel >= 2.13.0
BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.12.1
+BuildRequires: libwnck-devel >= 2.13.5
BuildRequires: pango-devel >= 1:1.10.1
BuildRequires: perl-base
BuildRequires: pkgconfig >= 1:0.15.0
@@ -38,13 +37,12 @@
BuildRequires: rpmbuild(macros) >= 1.197
BuildRequires: scrollkeeper >= 0.3.11
BuildConflicts: GConf-devel < 1.0.9-7
-Requires(post,postun): /sbin/ldconfig
Requires(post,preun): GConf2 >= 2.12.0
Requires(post,postun): scrollkeeper
Requires: %{name}-libs = %{version}-%{release}
+Requires: hicolor-icon-theme
Requires: gnome-desktop >= 2.12.1
Requires: gnome-icon-theme >= 2.12.1
-Requires: gnome-session >= 2.12.0
Requires: xdg-menus
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -96,7 +94,7 @@
Summary: GNOME panel library
Summary(pl): Biblioteka panelu GNOME
Group: X11/Libraries
-Requires: libgnomeui >= 2.12.0
+Requires: libgnomeui >= 2.13.0
Requires: librsvg >= 1:2.11.0
%description libs
@@ -109,7 +107,6 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
gnome-doc-prepare --copy --force
@@ -242,6 +239,24 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.173 2006/04/02 06:59:37 freetz
+- merged from DEVEL
+
+Revision 1.171.2.5 2006/03/21 19:14:59 freetz
+- rel.3 (dropping libhowl deps)
+
+Revision 1.171.2.4 2006/03/19 17:29:39 freetz
+- rel.2 for rebuild with libgsf 1.14.0
+
+Revision 1.171.2.3 2006/03/13 21:11:16 freetz
+- 2.14.0
+
+Revision 1.171.2.2 2006/02/13 20:56:17 freetz
+- 2.13.91
+
+Revision 1.171.2.1 2006/01/27 21:05:48 freetz
+- 2.13.90, merged launchers patches, updated BR
+
Revision 1.172 2006/02/08 16:05:38 freetz
- 2.12.3
================================================================
Index: SPECS/libwnck.spec
diff -u SPECS/libwnck.spec:1.53 SPECS/libwnck.spec:1.54
--- SPECS/libwnck.spec:1.53 Wed Feb 8 17:34:02 2006
+++ SPECS/libwnck.spec Sun Apr 2 08:59:37 2006
@@ -6,12 +6,12 @@
Summary: General Window Manager interfacing for GNOME utilities
Summary(pl): Interfejs General Window Manager dla narzędzi GNOME
Name: libwnck
-Version: 2.12.3
+Version: 2.14.0
Release: 1
License: LGPL
Group: Libraries
-Source0: http://ftp.gnome.org/pub/gnome/sources/libwnck/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: a3d7e72d8e756af0edd65380af795693
+Source0: http://ftp.gnome.org/pub/gnome/sources/libwnck/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: fd592a8cef2a8ae7712a09cb10e48ed1
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gtk+2-devel >= 2:2.8.0
@@ -111,6 +111,24 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.54 2006/04/02 06:59:37 freetz
+- merged from DEVEL
+
+Revision 1.52.2.5 2006/03/13 21:13:31 freetz
+- 2.14.0
+
+Revision 1.52.2.4 2006/02/28 08:34:42 freetz
+- 2.13.92
+
+Revision 1.52.2.3 2006/02/13 20:38:46 freetz
+- 2.13.91
+
+Revision 1.52.2.2 2006/01/30 18:13:52 freetz
+- 2.13.90
+
+Revision 1.52.2.1 2006/01/29 08:12:09 freetz
+- 2.13.5
+
Revision 1.53 2006/02/08 16:34:02 freetz
- 2.12.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gnome-panel.spec?r1=1.172&r2=1.173&f=u
http://cvs.pld-linux.org/SPECS/libwnck.spec?r1=1.53&r2=1.54&f=u