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

patrys patrys at pld-linux.org
Wed Mar 12 16:34:43 CET 2008 

Author: patrys                       Date: Wed Mar 12 15:34:43 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.22.0
- merged from DEVEL

---- Files affected:
SPECS:
   gnome-applets.spec (1.197 -> 1.198) 

---- Diffs:

================================================================
Index: SPECS/gnome-applets.spec
diff -u SPECS/gnome-applets.spec:1.197 SPECS/gnome-applets.spec:1.198
--- SPECS/gnome-applets.spec:1.197	Fri Feb  8 21:19:18 2008
+++ SPECS/gnome-applets.spec	Wed Mar 12 16:34:38 2008
@@ -4,60 +4,61 @@
 Summary(ru.UTF-8):	Маленькие программы, встраивающиеся в панель GNOME
 Summary(uk.UTF-8):	Маленькі програми, що вбудовуються в панель GNOME
 Name:		gnome-applets
-Version:	2.20.1
-Release:	2
+Version:	2.22.0
+Release:	1
 Epoch:		1
 License:	GPL v2, FDL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	e49402e7323bdd9595dc5cbfdba6ba5b
-Patch0:		%{name}-stickynotes-title-size.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	cd31cc9171cc350e7d0074b1a8092fbd
+Patch0:		%{name}-stb.patch
 Patch1:		%{name}-m4_fix.patch
-Patch2:		%{name}-use-liboobs.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.20.0
+BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.8
-BuildRequires:	gnome-control-center-devel >= 2.20.0
 BuildRequires:	cpufrequtils-devel >= 0.3
 BuildRequires:	dbus-glib-devel >= 0.73
 BuildRequires:	gail-devel >= 1.20.0
 BuildRequires:	gdbm-devel
 BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.16.0
 BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-desktop-devel >= 2.20.0
-BuildRequires:	gnome-doc-utils >= 0.12.0
-BuildRequires:	gnome-icon-theme >= 2.20.0
-BuildRequires:	gnome-panel-devel >= 2.20.0
-BuildRequires:	gnome-vfs2-devel >= 2.20.0
+BuildRequires:	gnome-desktop-devel >= 2.22.0
+BuildRequires:	gnome-doc-utils >= 0.11.2
+BuildRequires:	gnome-icon-theme >= 2.22.0
+BuildRequires:	gnome-panel-devel >= 2.22.0
+BuildRequires:	gnome-settings-daemon-devel >= 2.22.5
+BuildRequires:	gnome-vfs2-devel >= 2.22.0
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10.10
 BuildRequires:	gtk+2-devel >= 2:2.12.0
 BuildRequires:	gucharmap-devel >= 1.10.0
 BuildRequires:	hal-devel >= 0.5.9
 BuildRequires:	intltool >= 0.36.2
 BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomekbd-devel >= 2.20.0
-BuildRequires:	libgnomeui-devel >= 2.20.0
-BuildRequires:	libgtop-devel >= 1:2.20.0
+BuildRequires:	libgnomekbd-devel >= 2.21.4.1
+BuildRequires:	libgnomeui-devel >= 2.22.0
+BuildRequires:	libgtop-devel >= 1:2.22.0
 BuildRequires:	libnotify-devel >= 0.4.2
-BuildRequires:	liboobs-devel >= 2.20.0
+BuildRequires:	liboobs-devel >= 2.22.0
 BuildRequires:	libtool
-BuildRequires:	libwnck-devel >= 2.20.0
+BuildRequires:	libwnck-devel >= 2.22.0
 BuildRequires:	libxklavier-devel >= 3.0
 BuildRequires:	libxml2-devel >= 1:2.6.30
 BuildRequires:	libxslt-progs >= 1.1.20
 BuildRequires:	pkgconfig >= 1:0.19
-BuildRequires:	python-gnome-desktop-devel >= 2.20.0
+BuildRequires:	python-gnome-desktop-devel >= 2.22.0
 BuildRequires:	python-pygtk-devel >= 2:2.10.4
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper >= 0.3.11-4
-Requires:	gnome-icon-theme >= 2.20.0
-Requires:	gnome-panel >= 2.20.0
-Requires:	gnome-vfs2 >= 2.20.0
+BuildRequires:	system-tools-backends >= 2.6.0
+Requires:	gnome-icon-theme >= 2.22.0
+Requires:	gnome-panel >= 2.22.0
+Requires:	gnome-vfs2 >= 2.22.0
 Requires:	hicolor-icon-theme
-Requires:	libgnomeui >= 2.20.0
+Requires:	libgnomeui >= 2.22.0
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -80,20 +81,6 @@
 Пакет gnome-applets содержит апплеты Панели GNOME, увеличивающие
 комфортность работы в среде GNOME.
 
-%package devel
-Summary:	Header files for gnome-applets
-Summary(pl.UTF-8):	Pliki nagłówkowe gnome-applets
-Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	GConf2-devel >= 2.20.0
-Requires:	gtk+2-devel >= 2:2.12.0
-
-%description devel
-Header files for gnome-applets.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe gnome-applets.
-
 %package accessx-status
 Summary:	Keyboard Accessibility Status applet
 Summary(pl.UTF-8):	Aplet stanu dostepności klawiatury
@@ -101,7 +88,7 @@
 Requires(post,postun):	gtk+2
 Requires(post,postun):	scrollkeeper
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Suggests:	gnome-control-center >= 2.20.0
+Suggests:	gnome-control-center >= 2.22.0
 Conflicts:	gnome-applets <= 0:2.10.0-5
 
 %description accessx-status
@@ -262,7 +249,7 @@
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	gstreamer-audio-effects-base >= 0.10.10
 Requires:	gstreamer-audiosink
-Suggests:	gnome-media-volume-control >= 2.20.0
+Suggests:	gnome-media-volume-control >= 2.22.0
 Conflicts:	gnome-applets <= 0:2.10.0-5
 
 %description mixer
@@ -293,7 +280,7 @@
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Suggests:	gnome-system-monitor >= 2.20.0
+Suggests:	gnome-system-monitor >= 2.22.0
 Conflicts:	gnome-applets <= 0:2.10.0-5
 
 %description multiload
@@ -337,7 +324,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -459,10 +445,6 @@
 %post gweather
 /sbin/ldconfig
 %scrollkeeper_update_post
-%gconf_schema_install gweather.schemas
-
-%preun gweather
-%gconf_schema_uninstall gweather.schemas
 
 %postun gweather
 /sbin/ldconfig
@@ -579,11 +561,6 @@
 %lang(es_VE) %dir %{_datadir}/locale/es_VE
 %lang(es_VE) %dir %{_datadir}/locale/es_VE/LC_MESSAGES
 
-%files devel
-%defattr(644,root,root,755)
-%{_includedir}/*
-%{_pkgconfigdir}/*.pc
-
 %files accessx-status -f accessx-status.lang
 %defattr(644,root,root,755)
 %doc accessx-status/ChangeLog
@@ -646,11 +623,8 @@
 %defattr(644,root,root,755)
 %doc gweather/ChangeLog
 %attr(755,root,root) %{_libdir}/gweather-applet-2
-%attr(755,root,root) %{_libdir}/libgweather.so*
 %{_libdir}/bonobo/servers/GNOME_GWeatherApplet_Factory.server
 %{_datadir}/gnome-2.0/ui/GNOME_GWeatherApplet.xml
-%{_datadir}/%{name}/gweather
-%{_sysconfdir}/gconf/schemas/gweather.schemas
 
 %files invest
 %defattr(644,root,root,755)
@@ -784,13 +758,38 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.198  2008-03-12 15:34:38  patrys
+- 2.22.0
+- merged from DEVEL
+
+Revision 1.195.2.6  2008-03-12 15:30:28  patrys
+- 2.22.0
+
 Revision 1.197  2008-02-08 20:19:18  hawk
 - release 2
 
+Revision 1.195.2.5  2008-01-16 16:22:07  patrys
+- add gweather location patches
+
+Revision 1.195.2.4  2008-01-16 11:47:44  patrys
+- R: s-t-b
+
+Revision 1.195.2.3  2008-01-16 11:46:37  patrys
+- move devel to libgweather
+- make gnome-applets build with recent s-t-b
+
+Revision 1.195.2.2  2008-01-16 02:38:34  patrys
+- 2.21.4
+- drop patches not merged upstream (liboobs)
+
 Revision 1.196  2008-01-07 21:10:25  megabajt
 - updated to 2.20.1
 - use --with-omf
 
+Revision 1.195.2.1  2007-12-19 22:20:52  patrys
+- 2.21.2
+- use --with-omf
+
 Revision 1.195  2007-11-04 23:22:29  ankry
 - sr at Latn -> sr at latin, rel. 2
 
================================================================

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

More information about the pld-cvs-commit mailing list