From 09327ab9565800f992db5251dc5ac4594fb90a9d Mon Sep 17 00:00:00 2001 From: Marcin Banasiak Date: Wed, 14 Mar 2007 22:27:31 +0000 Subject: [PATCH] - updated to 2.18.0; merged changes from DEVEL Changed files: gnome-applets.spec -> 1.190 --- gnome-applets.spec | 138 ++++++++++++++++++++++++++------------------- 1 file changed, 81 insertions(+), 57 deletions(-) diff --git a/gnome-applets.spec b/gnome-applets.spec index f79510d..2a8069d 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -7,60 +7,64 @@ 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.16.2 +Version: 2.18.0 Release: 1 Epoch: 1 License: GPL v2, FDL Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.16/%{name}-%{version}.tar.bz2 -# Source0-md5: 1a46b8557ff05ca75e7db6adb4dd6707 +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.18/%{name}-%{version}.tar.bz2 +# Source0-md5: db3ef99c00335798f30fc0a9162c0257 Patch0: %{name}-stickynotes-title-size.patch Patch1: %{name}-m4_fix.patch Patch2: %{name}-desktop.patch Patch3: %{name}-modemlights-conditional.patch URL: http://www.gnome.org/ -BuildRequires: GConf2-devel >= 2.16.0 -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: control-center-devel >= 2.16.2 +BuildRequires: GConf2-devel >= 2.18.0.1 +BuildRequires: autoconf >= 2.59 +BuildRequires: automake >= 1:1.8 +BuildRequires: control-center-devel >= 2.18.0 BuildRequires: cpufrequtils-devel >= 0.3 -BuildRequires: dbus-glib-devel >= 0.71-2 -BuildRequires: gail-devel >= 1.9.3 +BuildRequires: dbus-glib-devel >= 0.73 +BuildRequires: gail-devel >= 1.18.0 BuildRequires: gdbm-devel BuildRequires: gettext-devel BuildRequires: gnome-common >= 2.12.0 -BuildRequires: gnome-desktop-devel >= 2.16.2 -BuildRequires: gnome-doc-utils >= 0.8.0 -BuildRequires: gnome-panel-devel >= 2.16.2 -BuildRequires: gnome-vfs2-devel >= 2.16.3 +BuildRequires: gnome-desktop-devel >= 2.18.0 +BuildRequires: gnome-doc-utils >= 0.10.1 +BuildRequires: gnome-icon-theme >= 2.18.0 +BuildRequires: gnome-panel-devel >= 2.18.0 +BuildRequires: gnome-vfs2-devel >= 2.18.0.1 BuildRequires: gstreamer-plugins-base-devel >= 0.10.10 -BuildRequires: gtk+2-devel >= 2:2.10.6 -BuildRequires: gucharmap-devel >= 1.8.0 +BuildRequires: gtk+2-devel >= 2:2.10.10 +BuildRequires: gucharmap-devel >= 1.10.0 BuildRequires: hal-devel >= 0.5.7.1 -BuildRequires: intltool >= 0.35.0 -BuildRequires: libgnomeui-devel >= 2.16.1 +BuildRequires: intltool >= 0.35.5 BuildRequires: libglade2-devel >= 1:2.6.0 -BuildRequires: libgtop-devel >= 1:2.14.4 +BuildRequires: libgnomekbd-devel >= 2.18.0 +BuildRequires: libgnomeui-devel >= 2.18.1 +BuildRequires: libgtop-devel >= 1:2.14.8 BuildRequires: libnotify-devel >= 0.4.2 BuildRequires: libtool -BuildRequires: libwnck-devel >= 2.16.2 -BuildRequires: libxml2-devel >= 1:2.6.27 +BuildRequires: libwnck-devel >= 2.18.0 BuildRequires: libxklavier-devel >= 3.0 -BuildRequires: libxslt-progs >= 1.1.17 -BuildRequires: pkgconfig -BuildRequires: python-gnome-desktop-devel >= 2.16.0 +BuildRequires: libxml2-devel >= 1:2.6.27 +BuildRequires: libxslt-progs >= 1.1.20 +BuildRequires: pkgconfig >= 1:0.19 +BuildRequires: python-gnome-desktop-devel >= 2.18.0 +BuildRequires: python-pygtk-devel >= 2:2.10.4 BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: scrollkeeper >= 0.3.11-4 %if %{with modemlights} BuildRequires: system-tools-backends >= 1.4.0 +# XXX: needs fix (it should work with s-t-b 2.1.4) BuildRequires: system-tools-backends < 1.9.0 %endif -Requires: gnome-icon-theme >= 2.16.1 -Requires: gnome-panel >= 2.16.2 -Requires: gnome-vfs2 >= 2.16.3 +Requires: gnome-icon-theme >= 2.18.0 +Requires: gnome-panel >= 2.18.0 +Requires: gnome-vfs2 >= 2.18.0.1 Requires: hicolor-icon-theme -Requires: libgnomeui >= 2.16.1 +Requires: libgnomeui >= 2.18.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _gnomehelpdir %{_datadir}/gnome/help @@ -86,8 +90,8 @@ 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.16.0 -Requires: gtk+2-devel >= 2:2.10.6 +Requires: GConf2-devel >= 2.18.0.1 +Requires: gtk+2-devel >= 2:2.10.10 %description devel Header files for gnome-applets. @@ -99,7 +103,7 @@ Pliki nagłówkowe gnome-applets. Summary: Keyboard Accessibility Status applet Summary(pl.UTF-8): Aplet stanu dostepności klawiatury Group: X11/Applications -Requires(post,postun): gtk+2 >= 2.10.6 +Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: gnome-applets <= 0:2.10.0-5 @@ -114,8 +118,8 @@ Aplet stanu dostepności klawiatury. Summary: Battery Charge Monitor applet Summary(pl.UTF-8): Aplet monitora stanu naładowania akumulatora Group: X11/Applications -Requires(post,preun): GConf2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: gnome-applets <= 0:2.10.0-5 @@ -129,9 +133,9 @@ Aplet monitora stanu naładowania akumulatora. Summary: Character Palette applet Summary(pl.UTF-8): Aplet palety znaków Group: X11/Applications -Requires(post,preun): GConf2 -Requires(post,postun): gtk+2 >= 2.10.6 +Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: gnome-applets <= 0:2.10.0-5 @@ -145,12 +149,12 @@ Aplet palety znaków. Summary: CPU Frequency Scaling Monitor applet Summary(pl.UTF-8): Aplet monitora częstotliwości procesora Group: X11/Applications -Requires(post,preun): GConf2 -Requires(post,postun): gtk+2 >= 2.10.6 +Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} -Conflicts: gnome-applets <= 0:2.10.0-5 Obsoletes: gnome-applet-cpufreq +Conflicts: gnome-applets <= 0:2.10.0-5 %description cpufreq CPU Frequency Scaling Monitor applet. @@ -162,8 +166,8 @@ Aplet monitora częstotliwości procesora. Summary: Disk Mounter applet Summary(pl.UTF-8): Aplet do montowania dysków Group: X11/Applications -Requires(post,preun): GConf2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: gnome-applets <= 0:2.10.0-5 @@ -177,9 +181,9 @@ Aplet do monotwania dysków. Summary: Geyes applet Summary(pl.UTF-8): Aplet geyes Group: X11/Applications -Requires(post,preun): GConf2 -Requires(post,postun): gtk+2 >= 2.10.6 +Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: gnome-applets <= 0:2.10.0-5 @@ -193,8 +197,8 @@ Aplet geyes. Summary: Weather Report applet Summary(pl.UTF-8): Aplet raportu pogodowego Group: X11/Applications -Requires(post,preun): GConf2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: notification-daemon Conflicts: gnome-applets <= 0:2.10.0-5 @@ -209,12 +213,12 @@ Aplet raportu pogodowego. Summary: Stock Ticker applet Summary(pl.UTF-8): Aplet wskaźnika giełdowego Group: X11/Applications -Requires(post,preun): GConf2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: python-gnome-extras-egg >= 2.14.2 -Conflicts: gnome-applets <= 0:2.10.0-5 Obsoletes: gnome-applets-gtik +Conflicts: gnome-applets <= 0:2.10.0-5 %description invest Stock Ticker applet. @@ -226,9 +230,9 @@ Aplet wskaźnika giełdowego. Summary: Keyboard Indicator applet Summary(pl.UTF-8): Aplet wskaźnika klawiatury Group: X11/Applications -Requires(post,preun): GConf2 -Requires(post,postun): gtk+2 >= 2.10.6 +Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: gnome-applets <= 0:2.10.0-5 @@ -242,8 +246,8 @@ Aplet wskaźnika klawiatury. Summary: Command Line applet Summary(pl.UTF-8): Aplet wiersza poleceń Group: X11/Applications -Requires(post,preun): GConf2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: gnome-applets <= 0:2.10.0-5 @@ -257,9 +261,9 @@ Aplet wiersza poleceń. Summary: Volume Control applet Summary(pl.UTF-8): Aplet regulacji głośności Group: X11/Applications -Requires(post,preun): GConf2 -Requires(post,postun): gtk+2 >= 2.10.6 +Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: gstreamer-audio-effects-base >= 0.10.10 Requires: gstreamer-audiosink @@ -275,10 +279,10 @@ Aplet regulacji głośności. Summary: Modem Lights applet Summary(pl.UTF-8): Aplet kontrolek modemu Group: X11/Applications -Requires(post,postun): gtk+2 >= 2.10.6 +Requires(post,postun): gtk+2 Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: system-tools-backends >= 1.4.0 Requires: system-tools-backends < 1.9.0 +Requires: system-tools-backends >= 1.4.0 Conflicts: gnome-applets <= 0:2.10.0-5 %description modemlights @@ -291,8 +295,8 @@ Aplet kontrolek modemu. Summary: System Monitor applet Summary(pl.UTF-8): Aplet monitora systemu Group: X11/Applications -Requires(post,preun): GConf2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: gnome-applets <= 0:2.10.0-5 @@ -306,12 +310,12 @@ Aplet monitora systemu. Summary: Sticky Notes applet Summary(pl.UTF-8): Aplet notatek Group: X11/Applications -Requires(post,preun): GConf2 -Requires(post,postun): gtk+2 >= 2.10.6 +Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name} = %{epoch}:%{version}-%{release} -Conflicts: gnome-applets <= 0:2.10.0-5 Obsoletes: gnotes_applet +Conflicts: gnome-applets <= 0:2.10.0-5 %description stickynotes Sticky Notes applet. @@ -444,7 +448,7 @@ EOF %preun drivemount %gconf_schema_uninstall drivemount.schemas -%postun drivemount +%postun drivemount %scrollkeeper_update_postun %post geyes @@ -455,7 +459,7 @@ EOF %preun geyes %gconf_schema_uninstall geyes.schemas -%postun geyes +%postun geyes %scrollkeeper_update_postun %update_icon_cache hicolor @@ -596,6 +600,7 @@ EOF %dir %{_omf_dest_dir}/accessx-status %{_omf_dest_dir}/accessx-status/accessx-status-C.omf %lang(bg) %{_omf_dest_dir}/accessx-status/accessx-status-bg.omf +%lang(en_GB) %{_omf_dest_dir}/accessx-status/accessx-status-en_GB.omf %lang(es) %{_omf_dest_dir}/accessx-status/accessx-status-es.omf %lang(fr) %{_omf_dest_dir}/accessx-status/accessx-status-fr.omf %lang(it) %{_omf_dest_dir}/accessx-status/accessx-status-it.omf @@ -615,8 +620,10 @@ EOF %dir %{_omf_dest_dir}/battstat %{_omf_dest_dir}/battstat/battstat-C.omf %lang(bg) %{_omf_dest_dir}/battstat/battstat-bg.omf +%lang(en_GB) %{_omf_dest_dir}/battstat/battstat-en_GB.omf %lang(es) %{_omf_dest_dir}/battstat/battstat-es.omf %lang(fr) %{_omf_dest_dir}/battstat/battstat-fr.omf +%lang(pa) %{_omf_dest_dir}/battstat/battstat-pa.omf %lang(sv) %{_omf_dest_dir}/battstat/battstat-sv.omf %lang(uk) %{_omf_dest_dir}/battstat/battstat-uk.omf @@ -631,6 +638,7 @@ EOF %dir %{_omf_dest_dir}/char-palette %{_omf_dest_dir}/char-palette/char-palette-C.omf %lang(bg) %{_omf_dest_dir}/char-palette/char-palette-bg.omf +%lang(en_GB) %{_omf_dest_dir}/char-palette/char-palette-en_GB.omf %lang(es) %{_omf_dest_dir}/char-palette/char-palette-es.omf %lang(fr) %{_omf_dest_dir}/char-palette/char-palette-fr.omf %lang(it) %{_omf_dest_dir}/char-palette/char-palette-it.omf @@ -652,6 +660,7 @@ EOF %{_iconsdir}/hicolor/*/apps/gnome-cpu-frequency-applet.* %dir %{_omf_dest_dir}/cpufreq-applet %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-C.omf +%lang(en_GB) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-en_GB.omf %lang(es) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-es.omf %lang(fr) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-fr.omf %lang(nl) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-nl.omf @@ -668,10 +677,12 @@ EOF %{_sysconfdir}/gconf/schemas/drivemount.schemas %dir %{_omf_dest_dir}/drivemount %{_omf_dest_dir}/drivemount/drivemount-C.omf +%lang(en_GB) %{_omf_dest_dir}/drivemount/drivemount-en_GB.omf %lang(es) %{_omf_dest_dir}/drivemount/drivemount-es.omf %lang(fr) %{_omf_dest_dir}/drivemount/drivemount-fr.omf %lang(it) %{_omf_dest_dir}/drivemount/drivemount-it.omf %lang(pa) %{_omf_dest_dir}/drivemount/drivemount-pa.omf +%lang(ru) %{_omf_dest_dir}/drivemount/drivemount-ru.omf %lang(sv) %{_omf_dest_dir}/drivemount/drivemount-sv.omf %lang(uk) %{_omf_dest_dir}/drivemount/drivemount-uk.omf %lang(zh_CN) %{_omf_dest_dir}/drivemount/drivemount-zh_CN.omf @@ -688,6 +699,7 @@ EOF %dir %{_omf_dest_dir}/geyes %{_omf_dest_dir}/geyes/geyes-C.omf %lang(bg) %{_omf_dest_dir}/geyes/geyes-bg.omf +%lang(en_GB) %{_omf_dest_dir}/geyes/geyes-en_GB.omf %lang(es) %{_omf_dest_dir}/geyes/geyes-es.omf %lang(fr) %{_omf_dest_dir}/geyes/geyes-fr.omf %lang(it) %{_omf_dest_dir}/geyes/geyes-it.omf @@ -706,9 +718,11 @@ EOF %{_sysconfdir}/gconf/schemas/gweather.schemas %dir %{_omf_dest_dir}/gweather %{_omf_dest_dir}/gweather/gweather-C.omf +%lang(en_GB) %{_omf_dest_dir}/gweather/gweather-en_GB.omf %lang(es) %{_omf_dest_dir}/gweather/gweather-es.omf %lang(fr) %{_omf_dest_dir}/gweather/gweather-fr.omf %lang(nl) %{_omf_dest_dir}/gweather/gweather-nl.omf +%lang(pa) %{_omf_dest_dir}/gweather/gweather-pa.omf %lang(sv) %{_omf_dest_dir}/gweather/gweather-sv.omf %lang(uk) %{_omf_dest_dir}/gweather/gweather-uk.omf @@ -733,7 +747,6 @@ EOF %doc gswitchit/ChangeLog %attr(755,root,root) %{_libdir}/gnome-keyboard-applet %{_libdir}/bonobo/servers/GNOME_KeyboardApplet.server -%{_desktopdir}/gswitchit-plugins.desktop %dir %{_datadir}/xmodmap %{_datadir}/xmodmap/base.xml %lang(hy) %{_datadir}/xmodmap/xmodmap.am* @@ -780,15 +793,16 @@ EOF %lang(uk) %{_datadir}/xmodmap/xmodmap.uk* %{_datadir}/xmodmap/xmodmap.us* %lang(hr,mk,sl,sr) %{_datadir}/xmodmap/xmodmap.yu* -%attr(755,root,root) %{_bindir}/gswitchit-plugins-capplet %{_datadir}/gnome-2.0/ui/GNOME_GSwitchItApplet.xml %{_datadir}/%{name}/glade/gswitchit*.glade %{_iconsdir}/hicolor/48x48/apps/gswitchit*.png %{_sysconfdir}/gconf/schemas/gswitchit.schemas %dir %{_omf_dest_dir}/gswitchit %{_omf_dest_dir}/gswitchit/gswitchit-C.omf +%lang(en_GB) %{_omf_dest_dir}/gswitchit/gswitchit-en_GB.omf %lang(es) %{_omf_dest_dir}/gswitchit/gswitchit-es.omf %lang(fr) %{_omf_dest_dir}/gswitchit/gswitchit-fr.omf +%lang(ru) %{_omf_dest_dir}/gswitchit/gswitchit-ru.omf %lang(sv) %{_omf_dest_dir}/gswitchit/gswitchit-sv.omf %lang(uk) %{_omf_dest_dir}/gswitchit/gswitchit-uk.omf @@ -805,6 +819,7 @@ EOF %{_sysconfdir}/gconf/schemas/mini-commander.schemas %dir %{_omf_dest_dir}/command-line %{_omf_dest_dir}/command-line/command-line-C.omf +%lang(en_GB) %{_omf_dest_dir}/command-line/command-line-en_GB.omf %lang(es) %{_omf_dest_dir}/command-line/command-line-es.omf %lang(fr) %{_omf_dest_dir}/command-line/command-line-fr.omf %lang(pt_BR) %{_omf_dest_dir}/command-line/command-line-pt_BR.omf @@ -820,9 +835,12 @@ EOF %{_sysconfdir}/gconf/schemas/mixer.schemas %dir %{_omf_dest_dir}/mixer_applet2 %{_omf_dest_dir}/mixer_applet2/mixer_applet2-C.omf +%lang(en_GB) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-en_GB.omf %lang(es) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-es.omf %lang(it) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-it.omf %lang(fr) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-fr.omf +%lang(pa) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-pa.omf +%lang(ru) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-ru.omf %lang(sv) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-sv.omf %lang(uk) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-uk.omf @@ -846,8 +864,11 @@ EOF %{_sysconfdir}/gconf/schemas/multiload.schemas %dir %{_omf_dest_dir}/multiload %{_omf_dest_dir}/multiload/multiload-C.omf +%lang(en_GB) %{_omf_dest_dir}/multiload/multiload-en_GB.omf %lang(es) %{_omf_dest_dir}/multiload/multiload-es.omf %lang(fr) %{_omf_dest_dir}/multiload/multiload-fr.omf +%lang(pa) %{_omf_dest_dir}/multiload/multiload-pa.omf +%lang(ru) %{_omf_dest_dir}/multiload/multiload-ru.omf %lang(sv) %{_omf_dest_dir}/multiload/multiload-sv.omf %lang(uk) %{_omf_dest_dir}/multiload/multiload-uk.omf @@ -863,8 +884,10 @@ EOF %{_sysconfdir}/gconf/schemas/stickynotes.schemas %dir %{_omf_dest_dir}/stickynotes_applet %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-C.omf +%lang(en_GB) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-en_GB.omf %lang(es) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-es.omf %lang(fr) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-fr.omf +%lang(pa) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-pa.omf %lang(sv) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-sv.omf %lang(uk) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-uk.omf @@ -877,6 +900,7 @@ EOF %{_datadir}/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml %dir %{_omf_dest_dir}/trashapplet %{_omf_dest_dir}/trashapplet/trashapplet-C.omf +%lang(en_GB) %{_omf_dest_dir}/trashapplet/trashapplet-en_GB.omf %lang(es) %{_omf_dest_dir}/trashapplet/trashapplet-es.omf %lang(fr) %{_omf_dest_dir}/trashapplet/trashapplet-fr.omf %lang(it) %{_omf_dest_dir}/trashapplet/trashapplet-it.omf -- 2.44.0