X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-applets.spec;h=ebca21cab4f089f4110466c4b1dd4996228024d1;hb=2d18cb81476a6528a5cc7ca73bd9628f317688c6;hp=0deacec3084c058f4f9d8e382a7459792176d689;hpb=bb64b72dc6d4294857c35aceaff5e4c9aa208276;p=packages%2Fgnome-applets.git diff --git a/gnome-applets.spec b/gnome-applets.spec index 0deacec..ebca21c 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -3,67 +3,62 @@ 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.22.0 -Release: 3 +Version: 2.28.0 +Release: 4 Epoch: 1 License: GPL v2, FDL Group: X11/Applications -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 +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! +Patch0: %{name}-m4_fix.patch URL: http://www.gnome.org/ -BuildRequires: GConf2-devel >= 2.22.0 +BuildRequires: GConf2-devel >= 2.26.0 +BuildRequires: NetworkManager-devel >= 0.7 BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.8 BuildRequires: cpufrequtils-devel >= 0.3 -BuildRequires: dbus-glib-devel >= 0.73 -BuildRequires: gail-devel >= 1.20.0 -BuildRequires: gdbm-devel +BuildRequires: dbus-glib-devel >= 0.74 BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.16.0 -BuildRequires: gnome-common >= 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: glib2-devel >= 1:2.20.0 +BuildRequires: gnome-common >= 2.24.0 +BuildRequires: gnome-desktop-devel >= 2.26.0 +BuildRequires: gnome-doc-utils >= 0.14.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.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.21.4.1 -BuildRequires: libgnomeui-devel >= 2.22.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.24.0 BuildRequires: libgtop-devel >= 1:2.22.0 -BuildRequires: libnotify-devel >= 0.4.2 -BuildRequires: liboobs-devel >= 2.22.0 +BuildRequires: libgweather-devel >= 2.26.0 +BuildRequires: libnotify-devel >= 0.4.4 BuildRequires: libtool -BuildRequires: libwnck-devel >= 2.22.0 -BuildRequires: libxklavier-devel >= 3.0 +BuildRequires: libwnck-devel >= 2.26.0 +BuildRequires: libxklavier-devel >= 4.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.22.0 -BuildRequires: python-pygtk-devel >= 2:2.10.4 +BuildRequires: polkit-devel >= 0.92 +BuildRequires: python-devel >= 1:2.4 +BuildRequires: python-gnome-desktop-devel +BuildRequires: python-gnome-devel >= 2.22.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 -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: gnome-icon-theme >= 2.26.0 +Requires: gnome-panel >= 2.26.0 Requires: hicolor-icon-theme -Requires: libgnomeui >= 2.22.0 +Obsoletes: gnome-applets-modemlights # sr@Latn vs. sr@latin Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _gnomehelpdir %{_datadir}/gnome/help - %description The gnome-applets package provides Panel applets which enhance your GNOME experience. @@ -87,7 +82,7 @@ Group: X11/Applications Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper Requires: %{name} = %{epoch}:%{version}-%{release} -Suggests: gnome-control-center >= 2.22.0 +Suggests: gnome-control-center >= 2.26.0 Conflicts: gnome-applets <= 0:2.10.0-5 %description accessx-status @@ -135,6 +130,7 @@ Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: polkit-gnome >= 0.92 Obsoletes: gnome-applet-cpufreq Conflicts: gnome-applets <= 0:2.10.0-5 @@ -182,7 +178,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 @@ -257,21 +253,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 @@ -279,7 +260,7 @@ Group: X11/Applications Requires(post,postun): scrollkeeper Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} -Suggests: gnome-system-monitor >= 2.22.0 +Suggests: gnome-system-monitor >= 2.24.0 Conflicts: gnome-applets <= 0:2.10.0-5 %description multiload @@ -322,7 +303,6 @@ Aplet śmietnika. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %{__gnome_doc_prepare} @@ -338,7 +318,7 @@ Aplet śmietnika. --disable-static \ --disable-schemas-install \ --enable-mini-commander \ - --enable-stickynotes + --enable-mixer-applet %{__make} %install @@ -354,8 +334,7 @@ rm -f $RPM_BUILD_ROOT%{py_sitedir}/invest/*.py mv -f $RPM_BUILD_ROOT%{_datadir}/locale/es{_ES,}/LC_MESSAGES/*.mo rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/es_ES -[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \ - mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin} + %find_lang %{name}-2.0 %find_lang accessx-status --with-gnome --with-omf %find_lang battstat --with-gnome --with-omf @@ -366,6 +345,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/es_ES %find_lang geyes --with-gnome --with-omf %find_lang gswitchit --with-gnome --with-omf %find_lang gweather --with-gnome --with-omf +%find_lang invest-applet --with-gnome --with-omf %find_lang mixer_applet2 --with-gnome --with-omf %find_lang multiload --with-gnome --with-omf %find_lang stickynotes_applet --with-gnome --with-omf @@ -407,9 +387,6 @@ rm -rf $RPM_BUILD_ROOT %post cpufreq %scrollkeeper_update_post %gconf_schema_install cpufreq-applet.schemas -%banner %{name} -e << EOF -For full functionality, set SUID /usr/bin/cpufreq-selector binary. -EOF %update_icon_cache hicolor %preun cpufreq @@ -451,9 +428,11 @@ EOF %post invest %scrollkeeper_update_post +%update_icon_cache hicolor %postun invest %scrollkeeper_update_postun +%update_icon_cache hicolor %post keyboard %scrollkeeper_update_post @@ -488,12 +467,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 @@ -532,7 +505,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/% %{_libdir}/bonobo/servers/GNOME_Panel_WirelessApplet.server %dir %{_libdir}/%{name} %dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/glade +%dir %{_datadir}/%{name}/builder %lang(es_CL) %dir %{_datadir}/locale/es_CL %lang(es_CL) %dir %{_datadir}/locale/es_CL/LC_MESSAGES %lang(es_CO) %dir %{_datadir}/locale/es_CO @@ -562,7 +535,6 @@ 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 %attr(755,root,root) %{_libdir}/accessx-status-applet %{_libdir}/bonobo/servers/GNOME_AccessxStatusApplet.server %{_datadir}/gnome-2.0/ui/GNOME_AccessxApplet.xml @@ -571,38 +543,36 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/% %files battstat -f battstat.lang %defattr(644,root,root,755) -%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 -%{_datadir}/%{name}/glade/battstat_applet.glade +%{_datadir}/%{name}/builder/battstat_applet.ui %{_sysconfdir}/gconf/schemas/battstat.schemas %{_sysconfdir}/sound/events/battstat_applet.soundlist %files charpicker -f char-palette.lang %defattr(644,root,root,755) -%doc charpick/ChangeLog %attr(755,root,root) %{_libdir}/charpick_applet2 %{_libdir}/bonobo/servers/GNOME_CharpickerApplet.server %{_datadir}/gnome-2.0/ui/GNOME_CharpickerApplet.xml -%{_iconsdir}/hicolor/48x48/apps/charpick.png %{_sysconfdir}/gconf/schemas/charpick.schemas %files cpufreq -f cpufreq-applet.lang %defattr(644,root,root,755) -%doc cpufreq/ChangeLog %attr(755,root,root) %{_bindir}/cpufreq-selector %attr(755,root,root) %{_libdir}/cpufreq-applet %{_libdir}/bonobo/servers/GNOME_CPUFreqApplet.server +%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service %{_datadir}/gnome-2.0/ui/GNOME_CPUFreqApplet.xml -%{_datadir}/%{name}/glade/cpufreq-preferences.glade +%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy +%{_datadir}/%{name}/builder/cpufreq-preferences.ui +%{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas %{_pixmapsdir}/cpufreq-applet %{_iconsdir}/hicolor/*/apps/gnome-cpu-frequency-applet.* %files drivemount -f drivemount.lang %defattr(644,root,root,755) -%doc drivemount/ChangeLog %attr(755,root,root) %{_libdir}/drivemount_applet2 %{_libdir}/bonobo/servers/GNOME_DriveMountApplet.server %{_datadir}/gnome-2.0/ui/GNOME_DriveMountApplet.xml @@ -610,7 +580,6 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/% %files geyes -f geyes.lang %defattr(644,root,root,755) -%doc geyes/ChangeLog %attr(755,root,root) %{_libdir}/geyes_applet2 %{_libdir}/bonobo/servers/GNOME_GeyesApplet.server %{_datadir}/gnome-2.0/ui/GNOME_GeyesApplet.xml @@ -620,29 +589,26 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/% %files gweather -f gweather.lang %defattr(644,root,root,755) -%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 +%files invest -f invest-applet.lang %defattr(644,root,root,755) -%doc invest-applet/ChangeLog %attr(755,root,root) %{_bindir}/invest-chart %attr(755,root,root) %{_libdir}/invest-applet %{_libdir}/bonobo/servers/GNOME_GtikApplet.server %{_libdir}/bonobo/servers/Invest_Applet.server %{_datadir}/gnome-2.0/ui/Invest_Applet.xml +%{_datadir}/%{name}/builder/financialchart.ui +%{_datadir}/%{name}/builder/prefs-dialog.ui %{_datadir}/%{name}/invest-applet -%{_datadir}/%{name}/glade/financialchart.glade -%{_datadir}/%{name}/glade/prefs-dialog.glade -%{_pixmapsdir}/invest-big.png +%{_iconsdir}/hicolor/*/apps/invest-applet.* %dir %{py_sitedir}/invest %{py_sitedir}/invest/*.py[co] %files keyboard -f gswitchit.lang %defattr(644,root,root,755) -%doc gswitchit/ChangeLog %attr(755,root,root) %{_libdir}/gnome-keyboard-applet %{_libdir}/bonobo/servers/GNOME_KeyboardApplet.server %dir %{_datadir}/xmodmap @@ -692,41 +658,28 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/% %{_datadir}/xmodmap/xmodmap.us* %lang(hr,mk,sl,sr) %{_datadir}/xmodmap/xmodmap.yu* %{_datadir}/gnome-2.0/ui/GNOME_GSwitchItApplet.xml -%{_datadir}/%{name}/glade/gswitchit*.glade -%{_iconsdir}/hicolor/48x48/apps/gswitchit*.png +%{_datadir}/%{name}/builder/gswitchit*.ui %files minicommander -f command-line.lang %defattr(644,root,root,755) -%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 %{_datadir}/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml -%{_datadir}/%{name}/glade/mini-commander.glade +%{_datadir}/%{name}/builder/mini-commander.ui %{_iconsdir}/hicolor/48x48/apps/gnome-mini-commander.png %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas %{_sysconfdir}/gconf/schemas/mini-commander.schemas %files mixer -f mixer_applet2.lang %defattr(644,root,root,755) -%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}/%{name}/glade/modemlights.glade -%{_iconsdir}/hicolor/*/apps/gnome-modem-monitor-applet.* - %files multiload -f multiload.lang %defattr(644,root,root,755) -%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 @@ -734,19 +687,17 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/% %files stickynotes -f stickynotes_applet.lang %defattr(644,root,root,755) -%doc stickynotes/ChangeLog %attr(755,root,root) %{_libdir}/stickynotes_applet %{_libdir}/bonobo/servers/GNOME_StickyNotesApplet.server %{_datadir}/gnome-2.0/ui/GNOME_StickyNotesApplet.xml -%{_datadir}/%{name}/glade/stickynotes.glade +%{_datadir}/%{name}/builder/stickynotes.ui %{_pixmapsdir}/stickynotes %{_iconsdir}/hicolor/*/apps/gnome-sticky-notes-applet.* %{_sysconfdir}/gconf/schemas/stickynotes.schemas %files trash -f trashapplet.lang %defattr(644,root,root,755) -%doc trashapplet/ChangeLog %attr(755,root,root) %{_libdir}/trashapplet %{_libdir}/bonobo/servers/GNOME_Panel_TrashApplet.server -%{_datadir}/%{name}/glade/trashapplet-empty-progress.ui +%{_datadir}/%{name}/builder/trashapplet-empty-progress.ui %{_datadir}/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml