X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-applets.spec;h=a00f3203e26f8d6d46d72721f2240b0882b8eadd;hb=6261da7b978fc0668c8be70dea5d6d15d664f587;hp=55a149beb763027c7770a139a1368d3f1dded407;hpb=c2217076b2610beb51d5cf161271c9e17c9a9f12;p=packages%2Fgnome-applets.git

diff --git a/gnome-applets.spec b/gnome-applets.spec
index 55a149b..a00f320 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -3,58 +3,57 @@ Summary(pl.UTF-8):	Aplety GNOME - małe aplikacje osadzające się w panelu
 Summary(ru.UTF-8):	Маленькие программы, встраивающиеся в панель GNOME
 Summary(uk.UTF-8):	Маленькі програми, що вбудовуються в панель GNOME
 Name:		gnome-applets
-Version:	2.24.1
-Release:	2
+Version:	2.28.0
+Release:	3
 Epoch:		1
 License:	GPL v2, FDL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.24/%{name}-%{version}.tar.bz2
-# Source0-md5:	2a18ecec0da09cc504f8d9b5587ffbb5
-Patch0:		%{name}-modemlights.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.28/%{name}-%{version}.tar.bz2
+# Source0-md5:	9eb00e9dc468d2c5c71b70c9fb2b751c
 # check paths in Makefile before removing it!
-Patch1:		%{name}-m4_fix.patch
+Patch0:		%{name}-m4_fix.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.24.0
+BuildRequires:	GConf2-devel >= 2.26.0
+BuildRequires:	NetworkManager-devel >= 0.7
 BuildRequires:	PolicyKit-gnome-devel >= 0.7
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.8
 BuildRequires:	cpufrequtils-devel >= 0.3
-BuildRequires:	dbus-glib-devel >= 0.73
+BuildRequires:	dbus-glib-devel >= 0.74
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.18.0
+BuildRequires:	glib2-devel >= 1:2.20.0
 BuildRequires:	gnome-common >= 2.24.0
-BuildRequires:	gnome-desktop-devel >= 2.24.0
+BuildRequires:	gnome-desktop-devel >= 2.26.0
 BuildRequires:	gnome-doc-utils >= 0.14.0
-BuildRequires:	gnome-icon-theme >= 2.24.0
-BuildRequires:	gnome-panel-devel >= 2.24.0
-BuildRequires:	gnome-settings-daemon-devel >= 2.24.0
+BuildRequires:	gnome-icon-theme >= 2.26.0
+BuildRequires:	gnome-panel-devel >= 2.26.0
+BuildRequires:	gnome-settings-daemon-devel >= 2.26.0
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10.10
-BuildRequires:	gtk+2-devel >= 2:2.14.0
-BuildRequires:	gucharmap-devel >= 2.24.0
+BuildRequires:	gtk+2-devel >= 2:2.16.0
+BuildRequires:	gucharmap-devel >= 2.26.0
 BuildRequires:	hal-devel >= 0.5.10
 BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libgnomekbd-devel >= 2.21.4.1
-BuildRequires:	libgnomeui-devel >= 2.24.0
+BuildRequires:	libgnomekbd-devel >= 2.24.0
 BuildRequires:	libgtop-devel >= 1:2.22.0
-BuildRequires:	libgweather-devel >= 2.24.0
-BuildRequires:	libnotify-devel >= 0.4.2
+BuildRequires:	libgweather-devel >= 2.26.0
+BuildRequires:	libnotify-devel >= 0.4.4
 BuildRequires:	libtool
-BuildRequires:	libwnck-devel >= 2.24.0
+BuildRequires:	libwnck-devel >= 2.26.0
 BuildRequires:	libxml2-devel >= 1:2.6.30
 BuildRequires:	libxslt-progs >= 1.1.20
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	python-devel >= 1:2.4
 BuildRequires:	python-gnome-desktop-devel
 BuildRequires:	python-gnome-devel >= 2.22.0
-BuildRequires:	python-pygtk-devel >= 2:2.12.0
+BuildRequires:	python-pygtk-devel >= 2:2.14.0
 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.24.0
-Requires:	gnome-panel >= 2.24.0
+Requires:	gnome-icon-theme >= 2.26.0
+Requires:	gnome-panel >= 2.26.0
 Requires:	hicolor-icon-theme
-Requires:	libgnomeui >= 2.24.0
+Obsoletes:	gnome-applets-modemlights
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -82,7 +81,7 @@ Group:		X11/Applications
 Requires(post,postun):	gtk+2
 Requires(post,postun):	scrollkeeper
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Suggests:	gnome-control-center >= 2.24.0
+Suggests:	gnome-control-center >= 2.26.0
 Conflicts:	gnome-applets <= 0:2.10.0-5
 
 %description accessx-status
@@ -177,7 +176,7 @@ Group:		X11/Applications
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	notification-daemon
+Requires:	dbus(org.freedesktop.Notifications)
 Conflicts:	gnome-applets <= 0:2.10.0-5
 
 %description gweather
@@ -252,21 +251,6 @@ Volume Control applet.
 %description mixer -l pl.UTF-8
 Aplet regulacji głośności.
 
-%package modemlights
-Summary:	Modem Lights applet
-Summary(pl.UTF-8):	Aplet kontrolek modemu
-Group:		X11/Applications
-Requires(post,postun):	gtk+2
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	system-tools-backends
-Conflicts:	gnome-applets <= 0:2.10.0-5
-
-%description modemlights
-Modem Lights applet.
-
-%description modemlights -l pl.UTF-8
-Aplet kontrolek modemu.
-
 %package multiload
 Summary:	System Monitor applet
 Summary(pl.UTF-8):	Aplet monitora systemu
@@ -317,7 +301,6 @@ Aplet śmietnika.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -333,7 +316,7 @@ Aplet śmietnika.
 	--disable-static \
 	--disable-schemas-install \
 	--enable-mini-commander \
-	--with-gstreamer=0.10
+	--enable-mixer-applet
 %{__make}
 
 %install
@@ -485,12 +468,6 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 %postun mixer
 %scrollkeeper_update_postun
 
-%post modemlights
-%update_icon_cache hicolor
-
-%postun modemlights
-%update_icon_cache hicolor
-
 %post multiload
 %scrollkeeper_update_post
 %gconf_schema_install multiload.schemas
@@ -559,7 +536,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 
 %files accessx-status -f accessx-status.lang
 %defattr(644,root,root,755)
-%doc accessx-status/ChangeLog
+#%doc accessx-status/ChangeLog
 %attr(755,root,root) %{_libdir}/accessx-status-applet
 %{_libdir}/bonobo/servers/GNOME_AccessxStatusApplet.server
 %{_datadir}/gnome-2.0/ui/GNOME_AccessxApplet.xml
@@ -568,7 +545,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 
 %files battstat -f battstat.lang
 %defattr(644,root,root,755)
-%doc battstat/ChangeLog
+#%doc battstat/ChangeLog
 %attr(755,root,root) %{_libdir}/battstat-applet-2
 %{_libdir}/bonobo/servers/GNOME_BattstatApplet.server
 %{_datadir}/gnome-2.0/ui/GNOME_BattstatApplet.xml
@@ -578,7 +555,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 
 %files charpicker -f char-palette.lang
 %defattr(644,root,root,755)
-%doc charpick/ChangeLog
+#%doc charpick/ChangeLog
 %attr(755,root,root) %{_libdir}/charpick_applet2
 %{_libdir}/bonobo/servers/GNOME_CharpickerApplet.server
 %{_datadir}/gnome-2.0/ui/GNOME_CharpickerApplet.xml
@@ -586,11 +563,11 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 
 %files cpufreq -f cpufreq-applet.lang
 %defattr(644,root,root,755)
-%doc cpufreq/ChangeLog
+#%doc cpufreq/ChangeLog
 %attr(755,root,root) %{_bindir}/cpufreq-selector
 %attr(755,root,root) %{_libdir}/cpufreq-applet
 %{_libdir}/bonobo/servers/GNOME_CPUFreqApplet.server
-%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
+#%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 %{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
 %{_datadir}/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
 %{_datadir}/%{name}/builder/cpufreq-preferences.ui
@@ -601,7 +578,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 
 %files drivemount -f drivemount.lang
 %defattr(644,root,root,755)
-%doc drivemount/ChangeLog
+#%doc drivemount/ChangeLog
 %attr(755,root,root) %{_libdir}/drivemount_applet2
 %{_libdir}/bonobo/servers/GNOME_DriveMountApplet.server
 %{_datadir}/gnome-2.0/ui/GNOME_DriveMountApplet.xml
@@ -609,7 +586,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 
 %files geyes -f geyes.lang
 %defattr(644,root,root,755)
-%doc geyes/ChangeLog
+#%doc geyes/ChangeLog
 %attr(755,root,root) %{_libdir}/geyes_applet2
 %{_libdir}/bonobo/servers/GNOME_GeyesApplet.server
 %{_datadir}/gnome-2.0/ui/GNOME_GeyesApplet.xml
@@ -619,14 +596,14 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 
 %files gweather -f gweather.lang
 %defattr(644,root,root,755)
-%doc gweather/ChangeLog
+#%doc gweather/ChangeLog
 %attr(755,root,root) %{_libdir}/gweather-applet-2
 %{_libdir}/bonobo/servers/GNOME_GWeatherApplet_Factory.server
 %{_datadir}/gnome-2.0/ui/GNOME_GWeatherApplet.xml
 
 %files invest -f invest-applet.lang
 %defattr(644,root,root,755)
-%doc invest-applet/ChangeLog
+#%doc invest-applet/ChangeLog
 %attr(755,root,root) %{_bindir}/invest-chart
 %attr(755,root,root) %{_libdir}/invest-applet
 %{_libdir}/bonobo/servers/GNOME_GtikApplet.server
@@ -641,7 +618,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 
 %files keyboard -f gswitchit.lang
 %defattr(644,root,root,755)
-%doc gswitchit/ChangeLog
+#%doc gswitchit/ChangeLog
 %attr(755,root,root) %{_libdir}/gnome-keyboard-applet
 %{_libdir}/bonobo/servers/GNOME_KeyboardApplet.server
 %dir %{_datadir}/xmodmap
@@ -695,7 +672,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 
 %files minicommander -f command-line.lang
 %defattr(644,root,root,755)
-%doc mini-commander/ChangeLog
+#%doc mini-commander/ChangeLog
 %attr(755,root,root) %{_libdir}/mini_commander_applet
 %attr(755,root,root) %{_libdir}/%{name}/mc-install-default-macros
 %{_libdir}/bonobo/servers/GNOME_MiniCommanderApplet.server
@@ -707,24 +684,15 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 
 %files mixer -f mixer_applet2.lang
 %defattr(644,root,root,755)
-%doc mixer/ChangeLog
+#%doc mixer/ChangeLog
 %attr(755,root,root) %{_libdir}/mixer_applet2
 %{_libdir}/bonobo/servers/GNOME_MixerApplet.server
 %{_datadir}/gnome-2.0/ui/GNOME_MixerApplet.xml
 %{_sysconfdir}/gconf/schemas/mixer.schemas
 
-%files modemlights
-%defattr(644,root,root,755)
-%doc modemlights/ChangeLog
-%attr(755,root,root) %{_libdir}/modem_applet
-%{_libdir}/bonobo/servers/GNOME_ModemLights.server
-%{_datadir}/gnome-2.0/ui/GNOME_ModemLights.xml
-%{_datadir}/gnome-applets/builder/modemlights.ui
-%{_iconsdir}/hicolor/*/apps/gnome-modem-monitor-applet.*
-
 %files multiload -f multiload.lang
 %defattr(644,root,root,755)
-%doc multiload/ChangeLog
+#%doc multiload/ChangeLog
 %attr(755,root,root) %{_libdir}/multiload-applet-2
 %{_libdir}/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
 %{_datadir}/gnome-2.0/ui/GNOME_MultiloadApplet.xml
@@ -732,7 +700,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 
 %files stickynotes -f stickynotes_applet.lang
 %defattr(644,root,root,755)
-%doc stickynotes/ChangeLog
+#%doc stickynotes/ChangeLog
 %attr(755,root,root) %{_libdir}/stickynotes_applet
 %{_libdir}/bonobo/servers/GNOME_StickyNotesApplet.server
 %{_datadir}/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
@@ -743,7 +711,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 
 %files trash -f trashapplet.lang
 %defattr(644,root,root,755)
-%doc trashapplet/ChangeLog
+#%doc trashapplet/ChangeLog
 %attr(755,root,root) %{_libdir}/trashapplet
 %{_libdir}/bonobo/servers/GNOME_Panel_TrashApplet.server
 %{_datadir}/%{name}/builder/trashapplet-empty-progress.ui