SPECS (DEVEL): gnome-menus.spec - 2.21.5

[patrys]

Author: patrys                       Date: Tue Jan 15 15:13:17 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 2.21.5

---- Files affected:
SPECS:
   gnome-menus.spec (1.58.2.2 -> 1.58.2.3) 

---- Diffs:

================================================================
Index: SPECS/gnome-menus.spec
diff -u SPECS/gnome-menus.spec:1.58.2.2 SPECS/gnome-menus.spec:1.58.2.3
--- SPECS/gnome-menus.spec:1.58.2.2	Mon Dec 24 14:36:57 2007
+++ SPECS/gnome-menus.spec	Tue Jan 15 16:13:12 2008
@@ -2,19 +2,19 @@
 Summary:	Implementation of the draft Desktop Menu Specification
 Summary(pl.UTF-8):	Implementacja specyfikacji menu systemĂłw biurkowych
 Name:		gnome-menus
-Version:	2.21.3
+Version:	2.21.5
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.21/%{name}-%{version}.tar.bz2
-# Source0-md5:	1605f408e1b5d36223544942f659d31c
+# Source0-md5:	e839651bd7eb9b5c579d12f324dc193e
 Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-nokde.patch
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.15.0
+BuildRequires:	glib2-devel >= 1:2.15.2
 BuildRequires:	gnome-common
 BuildRequires:	intltool >= 0.36.2
 BuildRequires:	libtool
@@ -22,9 +22,10 @@
 BuildRequires:	python-devel >= 2.2
 BuildRequires:	rpm-pythonprov
 BuildRequires:	sed >= 4.0
-Requires:	%{name}-filter
 Requires:	%{name}-libs = %{version}-%{release}
 Provides:	xdg-menus
+Obsoletes:	gnome-menus-filter-default
+Obsoletes:	gnome-menus-filter-desktop
 Conflicts:	applnk
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
@@ -52,20 +53,6 @@
 %description editor -l pl.UTF-8
 Prosty edytor menu.
 
-%package filter-default
-Summary:	Default gnome-menus filter
-Summary(pl.UTF-8):	Domyślny filtr gnome-menus
-Group:		X11/Applications
-Requires:	gnome-menus
-Provides:	%{name}-filter
-Obsoletes:	gnome-menus-filter-desktop
-
-%description filter-default
-Default gnome-menus filter. Includes all applications.
-
-%description filter-default -l pl.UTF-8
-Domyślny filtr gnome-menus. Zawiera wszystkie aplikacje.
-
 %package libs
 Summary:	gnome-menus library
 Summary(pl.UTF-8):	Biblioteka gnome-menus
@@ -153,6 +140,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/gnome-menu-spec-test
+%{_sysconfdir}/xdg/menus
 %{_datadir}/desktop-directories
 
 %files editor
@@ -164,10 +152,6 @@
 %attr(755,root,root) %{py_sitedir}/gmenu.so
 %{py_sitedir}/GMenuSimpleEditor/*.py[co]
 
-%files filter-default
-%defattr(644,root,root,755)
-%{_sysconfdir}/xdg/menus
-
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnome-menu.so.*.*.*
@@ -190,6 +174,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58.2.3  2008-01-15 15:13:12  patrys
+- 2.21.5
+
 Revision 1.58.2.2  2007-12-24 13:36:57  megabajt
 - updated to 2.21.3
 - use gio as monitor backend
================================================================

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