SPECS: gnome-menus.spec - 2.22.0 - merged from DEVEL

Tue Mar 11 20:17:20 CET 2008

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

---- Files affected:
SPECS:
   gnome-menus.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: SPECS/gnome-menus.spec
diff -u SPECS/gnome-menus.spec:1.59 SPECS/gnome-menus.spec:1.60

--- SPECS/gnome-menus.spec:1.59	Wed Jan  9 21:35:51 2008
+++ SPECS/gnome-menus.spec	Tue Mar 11 20:17:14 2008
@@ -2,20 +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.20.3
+Version:	2.22.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	b8ab05f5edfdc3e6a46662a504934657
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	b504e4ea92fcf5b1c2817d682ac5f61c
 Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-nokde.patch
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	fam-devel
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.14.1
+BuildRequires:	glib2-devel >= 1:2.16.0
 BuildRequires:	gnome-common
 BuildRequires:	intltool >= 0.36.2
 BuildRequires:	libtool
@@ -23,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
@@ -53,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
@@ -88,8 +74,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki gnome-menus
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	fam-devel
-Requires:	glib2-devel >= 1:2.14.1
+Requires:	glib2-devel >= 1:2.16.0
 
 %description devel
 Headers for gnome-menus library.
@@ -114,8 +99,8 @@
 %patch0 -p1
 %patch1 -p1
 
-sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
-mv po/sr\@{Latn,latin}.po
+sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
 
 %build
 %{__glib_gettextize}
@@ -123,8 +108,10 @@
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
+	--with-monitor-backend=gio \
 	--enable-static \
 	--enable-python
 %{__make}
@@ -136,7 +123,7 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir}
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/gn
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/{gn,io}
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/GMenuSimpleEditor/*.{a,la,py}
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{a,la}
 
@@ -153,7 +140,7 @@
 %files -f %{name}.lang
 %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
@@ -162,27 +149,24 @@
 %{_datadir}/%{name}
 %{_desktopdir}/gmenu-simple-editor.desktop
 %dir %{py_sitedir}/GMenuSimpleEditor
-%attr(755,root,root) %{py_sitedir}/*.so
+%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.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnome-menu.so.2
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_pkgconfigdir}/*.pc
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libgnome-menu.so
+%{_libdir}/libgnome-menu.la
+%{_pkgconfigdir}/libgnome-menu.pc
+%{_includedir}/gnome-menus
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgnome-menu.a
 
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -191,9 +175,36 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2008-03-11 19:17:14  patrys
+- 2.22.0
+- merged from DEVEL
+
+Revision 1.58.2.7  2008-03-11 19:15:42  patrys
+- 2.22.0
+
+Revision 1.58.2.6  2008-02-11 19:39:54  megabajt
+- updated to 2.21.91
+
+Revision 1.58.2.5  2008-01-28 16:27:36  megabajt
+- io locale seems to be unsupported
+
+Revision 1.58.2.4  2008-01-28 13:32:46  megabajt
+- updated to 2.21.90
+
+Revision 1.58.2.3  2008-01-15 15:13:12  patrys
+- 2.21.5
+
 Revision 1.59  2008-01-09 20:35:51  megabajt
 - updated to 2.20.3
 
+Revision 1.58.2.2  2007-12-24 13:36:57  megabajt
+- updated to 2.21.3
+- use gio as monitor backend
+- more verbose files
+
+Revision 1.58.2.1  2007-12-19 21:50:04  patrys
+- 2.21.2
+
 Revision 1.58  2007-11-27 20:52:49  qboosh
 - BR: sed 4.0
 
================================================================

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

