SPECS: gnome-menus.spec - Merged from DEVEL, 2.12.0

[aflinta]

Author: aflinta                      Date: Tue Sep  6 13:01:11 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Merged from DEVEL, 2.12.0

---- Files affected:
SPECS:
   gnome-menus.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/gnome-menus.spec
diff -u SPECS/gnome-menus.spec:1.24 SPECS/gnome-menus.spec:1.25
--- SPECS/gnome-menus.spec:1.24	Fri Jul  1 13:15:52 2005
+++ SPECS/gnome-menus.spec	Tue Sep  6 15:01:02 2005
@@ -2,23 +2,24 @@
 Summary:	Implementation of the draft Desktop Menu Specification
 Summary(pl):	Implementacja specyfikacji menu systemów biurkowych
 Name:		gnome-menus
-Version:	2.10.2
+Version:	2.12.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-menus/2.10/%{name}-%{version}.tar.bz2
-# Source0-md5:	97b0ad03ea219cc8f5c02585db1d237e
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-menus/2.12/%{name}-%{version}.tar.bz2
+# Source0-md5:	615392c4f729f70c03aa3aa7dbe40a95
 Patch0:		%{name}-PLD.patch
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.6.3
+BuildRequires:	glib2-devel >= 1:2.8.1
 BuildRequires:	gnome-common
-BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
+BuildRequires:	gnome-vfs2-devel >= 2.12.0
 BuildRequires:	intltool >= 0.31
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
+BuildRequires:	python-devel
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	%{name}-filter
 Provides:	xdg-menus
@@ -34,6 +35,18 @@
 Pakiet zawiera implementację specyfikacji menu systemów biurkowych z
 freedesktop.org: http://www.freedesktop.org/Standards/menu-spec .
 
+%package editor
+Summary:	Simple menu editor
+Summary(pl):	Prosty edytor menu
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description editor
+Simple menu editor.
+
+%description editor -l pl
+Prosty edytor menu.
+
 %package filter-default
 Summary:	Default gnome-menus filter
 Summary(pl):	Domyślny filtr gnome-menus
@@ -69,7 +82,7 @@
 Summary(pl):	Pliki nagłówkowe biblioteki gnome-menus
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.6.3
+Requires:	glib2-devel >= 1:2.8.1
 
 %description devel
 Headers for gnome-menus library.
@@ -110,6 +123,8 @@
 	pkgconfigdir=%{_pkgconfigdir}
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/GMenuSimpleEditor/*.{a,la,py}
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{a,la}
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -122,9 +137,17 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/gnome-menu-spec-test
 %{_datadir}/desktop-directories
 
+%files editor
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gmenu-simple-editor
+%{_datadir}/%{name}
+%{_desktopdir}/gmenu-simple-editor.desktop
+%{py_sitedir}/GMenuSimpleEditor/*.py[co]
+%{py_sitedir}/*.so
+
 %files filter-default
 %defattr(644,root,root,755)
 %{_sysconfdir}/xdg/menus
@@ -150,6 +173,36 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2005/09/06 13:01:02  aflinta
+- Merged from DEVEL, 2.12.0
+
+Revision 1.24.2.9  2005/08/22 19:37:45  aflinta
+- version 2.11.92
+
+Revision 1.24.2.8  2005/08/09 13:37:41  aflinta
+- ups, missing desktop file
+
+Revision 1.24.2.7  2005/08/09 13:34:35  aflinta
+- up to version 2.11.91
+
+Revision 1.24.2.6  2005/08/07 17:06:22  paladine
+- missing BR: python-devel
+
+Revision 1.24.2.5  2005/07/26 14:32:44  paladine
+- added pl patch
+
+Revision 1.24.2.4  2005/07/26 14:19:17  freetz
+- 2.11.90
+
+Revision 1.24.2.3  2005/07/26 12:57:33  paladine
+- editor should be in editor subpackage ;), rel. 2
+
+Revision 1.24.2.2  2005/07/10 20:47:46  freetz
+- menu editor packaged
+
+Revision 1.24.2.1  2005/07/03 16:56:55  freetz
+- 2.11.1.1, TODO added
+
 Revision 1.24  2005/07/01 11:15:52  zbyniu
 - BR: gettext-devel, pkgconfig
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-menus.spec?r1=1.24&r2=1.25&f=u