From da523ee75f658b2797395963068d335ee04952da Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 27 Dec 2012 21:27:06 +0200 Subject: [PATCH] mate-applets, 1.5.0 languages seriously broken, or find lang needs to be updated for mate --- mate-applets.spec | 546 +++++++++++++++++++++---------------- mate-gnome-conflicts.patch | 44 +++ 2 files changed, 352 insertions(+), 238 deletions(-) create mode 100644 mate-gnome-conflicts.patch diff --git a/mate-applets.spec b/mate-applets.spec index 2e59bb8..4e0fe68 100644 --- a/mate-applets.spec +++ b/mate-applets.spec @@ -1,18 +1,21 @@ -Summary: Small applications which embed themselves in the GNOME panel -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.32.1.1 -Release: 2 -Epoch: 1 +# TODO +# - battstat applet requires deprecated apmd, not repsent in th +Summary: Small applications which embed themselves in the MATE panel +Summary(pl.UTF-8): Aplety MATE - małe aplikacje osadzające się w panelu +Summary(ru.UTF-8): Маленькие программы, встраивающиеся в панель MATE +Summary(uk.UTF-8): Маленькі програми, що вбудовуються в панель MATE +Name: mate-applets +Version: 1.5.0 +Release: 0.8 License: GPL v2, FDL Group: X11/Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.32/%{name}-%{version}.tar.bz2 -# Source0-md5: 031c207a18707263828b4a4fd784bbe4 +Source0: http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz +# Source0-md5: 4d7fe1c9b2dc14544c83fdbf17464a13 # check paths in Makefile before removing it! -Patch0: %{name}-m4_fix.patch -URL: http://www.gnome.org/ +#Patch0: m4_fix.patch +Patch0: mate-gnome-conflicts.patch +URL: http://mate-desktop.org/ +%if 0 BuildRequires: GConf2-devel >= 2.26.0 BuildRequires: NetworkManager-devel >= 0.7 BuildRequires: autoconf >= 2.59 @@ -26,8 +29,6 @@ BuildRequires: glib2-devel >= 1:2.22.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.32.0 BuildRequires: gnome-settings-daemon-devel >= 2.26.0 BuildRequires: gstreamer-plugins-base-devel >= 0.10.10 BuildRequires: gtk+2-devel >= 2:2.20.0 @@ -43,6 +44,7 @@ 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: mate-panel-devel >= 2.32.0 BuildRequires: pkgconfig >= 1:0.19 BuildRequires: polkit-devel >= 0.92 BuildRequires: python-devel >= 1:2.4 @@ -50,45 +52,44 @@ 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 Requires(post,postun): gtk-update-icon-cache Requires(post,postun): hicolor-icon-theme Requires: gnome-icon-theme >= 2.26.0 -Requires: gnome-panel >= 2.26.0 -Obsoletes: gnome-applets-keyboard -Obsoletes: gnome-applets-modemlights +Requires: mate-panel >= 2.26.0 # sr@Latn vs. sr@latin Conflicts: glibc-misc < 6:2.7 +%endif +BuildRequires: mate-icon-theme-devel >= 1.1.0 +BuildRequires: pkgconfig(libmatepanelapplet-4.0) +BuildRequires: rpmbuild(find_lang) >= 1.36 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -The gnome-applets package provides Panel applets which enhance your -GNOME experience. +The mate-applets package provides Panel applets which enhance your +MATE experience. %description -l pl.UTF-8 -Pakiet gnome-applets udostępnia aplety Panelu, które usprawniają pracę -z GNOME. +Pakiet mate-applets udostępnia aplety Panelu, które usprawniają pracę +z MATE. %description -l uk.UTF-8 -Пакет gnome-applets містить аплети Панелі GNOME, що збільшують -комфортність роботи в середовищі GNOME. +Пакет mate-applets містить аплети Панелі MATE, що збільшують +комфортність роботи в середовищі MATE. %description -l ru.UTF-8 -Пакет gnome-applets содержит апплеты Панели GNOME, увеличивающие -комфортность работы в среде GNOME. +Пакет mate-applets содержит апплеты Панели MATE, увеличивающие +комфортность работы в среде MATE. %package accessx-status Summary: Keyboard Accessibility Status applet Summary(pl.UTF-8): Aplet stanu dostepności klawiatury Group: X11/Applications -URL: http://library.gnome.org/users/accessx-status/stable/ Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper -Requires: %{name} = %{epoch}:%{version}-%{release} -Suggests: gnome-control-center >= 2.26.0 -Conflicts: gnome-applets < 0:2.10.0-6 +Requires: %{name} = %{version}-%{release} +Suggests: mate-control-center >= 1.5 %description accessx-status The Keyboard Accessibility Monitor shows you the status of the @@ -106,11 +107,9 @@ przyciski myszy są wciskane z poziomu klawiatury. Summary: Battery Charge Monitor applet Summary(pl.UTF-8): Aplet monitora stanu naładowania akumulatora Group: X11/Applications -URL: http://library.gnome.org/users/battstat/stable/ Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 -Requires: %{name} = %{epoch}:%{version}-%{release} -Conflicts: gnome-applets < 0:2.10.0-6 +Requires: %{name} = %{version}-%{release} +Requires: glib2 >= 1:2.26.0 %description battstat The Battery Charge Monitor shows the status of any batteries in your @@ -128,12 +127,10 @@ pozostały czas pracy przy założeniu bieżącego użycia prądu. Summary: Character Palette applet Summary(pl.UTF-8): Aplet palety znaków Group: X11/Applications -URL: http://library.gnome.org/users/char-palette/stable/ 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-6 +Requires: %{name} = %{version}-%{release} +Requires: glib2 >= 1:2.26.0 %description charpicker The Character Palette provides a convenient way to access characters @@ -163,14 +160,11 @@ do wyświetlania lub kopiowania dowolnych znaków unikodowych. Summary: CPU Frequency Scaling Monitor applet Summary(pl.UTF-8): Aplet monitora częstotliwości procesora Group: X11/Applications -URL: http://library.gnome.org/users/cpufreq-applet/stable/ 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-6 +Requires: %{name} = %{version}-%{release} +Requires: mate-polkit %description cpufreq The CPU Frequency Scaling Monitor provides a convenient way to monitor @@ -184,11 +178,9 @@ monitorowanie częstotliwości dla każdego procesora. Summary: Disk Mounter applet Summary(pl.UTF-8): Aplet do montowania dysków Group: X11/Applications -URL: http://library.gnome.org/users/drivemount/stable/ Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 -Requires: %{name} = %{epoch}:%{version}-%{release} -Conflicts: gnome-applets < 0:2.10.0-6 +Requires: %{name} = %{version}-%{release} +Requires: glib2 >= 1:2.26.0 %description drivemount The Disk Mounter enables you to quickly mount and unmount various @@ -202,12 +194,10 @@ różne rodzaje dysków i systemów plików. Summary: Geyes applet - tracking the mouse pointer Summary(pl.UTF-8): Aplet geyes - śledzenie wskaźnika myszy Group: X11/Applications -URL: http://library.gnome.org/users/geyes/stable/ 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-6 +Requires: %{name} = %{version}-%{release} +Requires: glib2 >= 1:2.26.0 %description geyes The Geyes applet provides an entertaining way to track the movement of @@ -223,12 +213,10 @@ podążających za wskaźnikiem myszy. Summary: Weather Report applet Summary(pl.UTF-8): Aplet raportu pogodowego Group: X11/Applications -URL: http://library.gnome.org/users/gweather/stable/ Requires(post,postun): scrollkeeper Requires(post,preun): GConf2 -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: dbus(org.freedesktop.Notifications) -Conflicts: gnome-applets < 0:2.10.0-6 %description gweather The Weather Report downloads weather information from the U.S. @@ -248,16 +236,13 @@ prognoz. Summary: Stock Ticker applet Summary(pl.UTF-8): Aplet wskaźnika giełdowego Group: X11/Applications -URL: http://library.gnome.org/users/invest-applet/stable/ Requires(post,postun): scrollkeeper Requires(post,preun): GConf2 -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: python-gnome-extras-egg >= 2.14.2 -Obsoletes: gnome-applets-gtik -Conflicts: gnome-applets < 0:2.10.0-6 %description invest -The Invest GNOME panel applet downloads current stock quotes from +The Invest MATE panel applet downloads current stock quotes from Yahoo! Finance and displays the quotes in a drop-down list. %description invest -l pl.UTF-8 @@ -268,11 +253,9 @@ Yahoo! Finance i wyświetlające je na rozwijanej liście. Summary: Command Line applet Summary(pl.UTF-8): Aplet wiersza poleceń Group: X11/Applications -URL: http://library.gnome.org/users/command-line/stable/ Requires(post,postun): scrollkeeper Requires(post,preun): GConf2 -Requires: %{name} = %{epoch}:%{version}-%{release} -Conflicts: gnome-applets < 0:2.10.0-6 +Requires: %{name} = %{version}-%{release} %description minicommander The Command Line provides a command line that you can use within any @@ -286,15 +269,13 @@ panelu na pulpicie. Summary: Volume Control applet Summary(pl.UTF-8): Aplet regulacji głośności Group: X11/Applications -URL: http://library.gnome.org/users/mixer_applet2/stable/ Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper Requires(post,preun): GConf2 -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: gstreamer-audio-effects-base >= 0.10.10 Requires: gstreamer-audiosink Suggests: gnome-media-volume-control >= 2.22.0 -Conflicts: gnome-applets < 0:2.10.0-6 %description mixer The Volume Control applet enables you to control the sound volume on @@ -315,12 +296,10 @@ więcej fal. Summary: System Monitor applet Summary(pl.UTF-8): Aplet monitora systemu Group: X11/Applications -URL: http://library.gnome.org/users/multiload/stable/ Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: glib2 >= 1:2.26.0 Suggests: gnome-system-monitor >= 2.24.0 -Conflicts: gnome-applets < 0:2.10.0-6 %description multiload The System Monitor displays system load information in graphical @@ -334,13 +313,10 @@ systemu w postaci graficznej. Summary: Sticky Notes applet Summary(pl.UTF-8): Aplet notatek Group: X11/Applications -URL: http://library.gnome.org/users/stickynotes_applet/stable/ Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 -Requires: %{name} = %{epoch}:%{version}-%{release} -Obsoletes: gnotes_applet -Conflicts: gnome-applets < 0:2.10.0-6 +Requires: %{name} = %{version}-%{release} +Requires: glib2 >= 1:2.26.0 %description stickynotes The Sticky Notes panel application enables you to create, view, and @@ -353,19 +329,17 @@ style. %description stickynotes -l pl.UTF-8 Aplet notatek pozwala na tworzenie, oglądanie i zarządzanie przyczepianymi notatkami na pulpicie. Pozwala modyfikować tytuł, -treść, wymiary i styl notatek. Przy restarcie panelu, na przykład -przy wylogowaniu i ponownym zalogowaniu, wszystkie notatki są -zapisywane, a następnie otwierane ponownie w tym samym miejscu, z tymi -samymi wymiarami i stylem. +treść, wymiary i styl notatek. Przy restarcie panelu, na przykład przy +wylogowaniu i ponownym zalogowaniu, wszystkie notatki są zapisywane, a +następnie otwierane ponownie w tym samym miejscu, z tymi samymi +wymiarami i stylem. %package trash Summary: Trash applet Summary(pl.UTF-8): Aplet śmietnika Group: X11/Applications -URL: http://library.gnome.org/users/trashapplet/stable/ Requires(post,postun): scrollkeeper -Requires: %{name} = %{epoch}:%{version}-%{release} -Conflicts: gnome-applets < 0:2.10.0-6 +Requires: %{name} = %{version}-%{release} %description trash The Panel Trash applet lets you manage your Trash from the panel. @@ -384,54 +358,152 @@ ale jest przydatny o tyle, że panele są zawsze widoczne. %patch0 -p1 %build -%{__gnome_doc_prepare} -%{__libtoolize} -%{__glib_gettextize} -%{__intltoolize} -%{__aclocal} -I m4 -%{__autoheader} -%{__gnome_doc_common} -%{__automake} -%{__autoconf} +NOCONFIGURE=1 ./autogen.sh %configure \ --disable-static \ --disable-schemas-install \ + --with-html-dir=%{_gtkdocdir} \ + --disable-gtk-doc \ + --disable-gtk-doc-html \ --enable-mini-commander \ - --enable-mixer-applet -%{__make} + --enable-mixer-applet \ + --disable-battstat +%{__make} \ + DOC_MODULE= %install rm -rf $RPM_BUILD_ROOT - +%if 1 +rm -rf $RPM_BUILD_ROOT %{__make} install \ + DOC_MODULE= \ DESTDIR=$RPM_BUILD_ROOT \ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \ pythondir=%{py_sitedir} -%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgweather.la -%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/invest/*.py +#%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgweather.la +%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/mate_invest/*.py # es_ES is more complete copy -mv -f $RPM_BUILD_ROOT%{_datadir}/locale/es{_ES,}/LC_MESSAGES/*.mo -%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/es_ES +mv -f $RPM_BUILD_ROOT%{_localedir}/es{_ES,}/LC_MESSAGES/*.mo +%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/es_ES # keyboard applet has been removed -%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/xmodmap - -%find_lang %{name}-2.0 -%find_lang accessx-status --with-gnome --with-omf -%find_lang battstat --with-gnome --with-omf -%find_lang char-palette --with-gnome --with-omf -%find_lang command-line --with-gnome --with-omf -%find_lang cpufreq-applet --with-gnome --with-omf -%find_lang drivemount --with-gnome --with-omf -%find_lang geyes --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 -%find_lang trashapplet --with-gnome --with-omf +#%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/xmodmap +%endif + +rm -f *.lang +%find_lang %{name} +cat <>%{name}.lang +%dir %{_datadir}/mate/help/C +%dir %{_datadir}/mate/help/C/figures +%dir %{_datadir}/mate/help/ar +%dir %{_datadir}/mate/help/ar/figures +%dir %{_datadir}/mate/help/ast +%dir %{_datadir}/mate/help/ast/figures +%dir %{_datadir}/mate/help/bg +%dir %{_datadir}/mate/help/bg/figures +%dir %{_datadir}/mate/help/ca +%dir %{_datadir}/mate/help/ca/figures +%dir %{_datadir}/mate/help/cs +%dir %{_datadir}/mate/help/cs/figures +%dir %{_datadir}/mate/help/da +%dir %{_datadir}/mate/help/da/figures +%dir %{_datadir}/mate/help/de +%dir %{_datadir}/mate/help/de/figures +%dir %{_datadir}/mate/help/el +%dir %{_datadir}/mate/help/el/figures +%dir %{_datadir}/mate/help/en_GB +%dir %{_datadir}/mate/help/en_GB/figures +%dir %{_datadir}/mate/help/es +%dir %{_datadir}/mate/help/es/figures +%dir %{_datadir}/mate/help/eu +%dir %{_datadir}/mate/help/eu/figures +%dir %{_datadir}/mate/help/fi +%dir %{_datadir}/mate/help/fi/figures +%dir %{_datadir}/mate/help/fr +%dir %{_datadir}/mate/help/fr/figures +%dir %{_datadir}/mate/help/gl +%dir %{_datadir}/mate/help/gl/figures +%dir %{_datadir}/mate/help/hu +%dir %{_datadir}/mate/help/hu/figures +%dir %{_datadir}/mate/help/it +%dir %{_datadir}/mate/help/it/figures +%dir %{_datadir}/mate/help/ko +%dir %{_datadir}/mate/help/ko/figures +%dir %{_datadir}/mate/help/nl +%dir %{_datadir}/mate/help/nl/figures +%dir %{_datadir}/mate/help/oc +%dir %{_datadir}/mate/help/oc/figures +%dir %{_datadir}/mate/help/pa +%dir %{_datadir}/mate/help/pa/figures +%dir %{_datadir}/mate/help/pt_BR +%dir %{_datadir}/mate/help/pt_BR/figures +%dir %{_datadir}/mate/help/ru +%dir %{_datadir}/mate/help/ru/figures +%dir %{_datadir}/mate/help/sv +%dir %{_datadir}/mate/help/sv/figures +%dir %{_datadir}/mate/help/uk +%dir %{_datadir}/mate/help/uk/figures +%dir %{_datadir}/mate/help/zh_CN +%dir %{_datadir}/mate/help/zh_CN/figures +%dir %{_datadir}/mate/help/zh_HK +%dir %{_datadir}/mate/help/zh_HK/figures +%dir %{_datadir}/mate/help/zh_TW +%dir %{_datadir}/mate/help/zh_TW/figures + +EOF +#%find_lang accessx-status --with-mate +cat <> accessx-status.lang +%{_datadir}/mate/help/*/figures/accessx*.png +EOF +#%find_lang battstat --with-mate +cat <> battstat.lang +%{_datadir}/mate/help/*/figures/battstat*.png +%{_datadir}/mate/help/*/figures/context-menu.png +EOF +#%find_lang char-palette --with-mate +cat <> char-palette.lang +%{_datadir}/mate/help/*/figures/charpalette*.png +%{_datadir}/mate/help/*/figures/charpick*.png +EOF +#%find_lang cpufreq --with-mate +cat <> cpufreq.lang +%{_datadir}/mate/help/*/figures/cpufreq*.png +EOF +#%find_lang drivemount --with-mate +cat <> drivemount.lang +%{_datadir}/mate/help/*/figures/drivemount*.png +EOF +#%find_lang geyes --with-mate +cat <> geyes.lang +%{_datadir}/mate/help/*/figures/geyes*.png +EOF +#%find_lang gweather --with-mate +cat <> gweather.lang +%{_datadir}/mate/help/*/figures/mateweather*.png +%{_datadir}/mate/help/*/figures/stock_weather-*.png +EOF +#%find_lang invest-applet --with-mate +cat <> invest-applet.lang +%{_datadir}/mate/help/*/figures/symbol-search.png +EOF +#%find_lang mixer_applet2 --with-mate +touch mixer_applet2.lang +#%find_lang multiload --with-mate +cat <> multiload.lang +%{_datadir}/mate/help/*/figures/multiload*.png +%{_datadir}/mate/help/*/figures/system_monitor.png +%{_datadir}/mate/help/*/figures/system-monitor-*.png +EOF +#%find_lang stickynotes_applet --with-mate +cat <> stickynotes_applet.lang +%{_datadir}/mate/help/*/figures/stickynote*.png +EOF +#%find_lang trashapplet --with-mate +cat <>trashapplet.lang +%{_datadir}/mate/help/*/figures/trash-applet.png +EOF %clean rm -rf $RPM_BUILD_ROOT @@ -446,21 +518,21 @@ rm -rf $RPM_BUILD_ROOT %post battstat %scrollkeeper_update_post -%gconf_schema_install battstat.schemas +%glib_compile_schemas %preun battstat -%gconf_schema_uninstall battstat.schemas +%glib_compile_schemas %postun battstat %scrollkeeper_update_postun %post charpicker %scrollkeeper_update_post -%gconf_schema_install charpick.schemas +%glib_compile_schemas %update_icon_cache hicolor %preun charpicker -%gconf_schema_uninstall charpick.schemas +%glib_compile_schemas %postun charpicker %scrollkeeper_update_postun @@ -480,21 +552,21 @@ rm -rf $RPM_BUILD_ROOT %post drivemount %scrollkeeper_update_post -%gconf_schema_install drivemount.schemas +%glib_compile_schemas %preun drivemount -%gconf_schema_uninstall drivemount.schemas +%glib_compile_schemas %postun drivemount %scrollkeeper_update_postun %post geyes %scrollkeeper_update_post -%gconf_schema_install geyes.schemas +%glib_compile_schemas %update_icon_cache hicolor %preun geyes -%gconf_schema_uninstall geyes.schemas +%glib_compile_schemas %postun geyes %scrollkeeper_update_postun @@ -543,21 +615,21 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/% %post multiload %scrollkeeper_update_post -%gconf_schema_install multiload.schemas +%glib_compile_schemas %preun multiload -%gconf_schema_uninstall multiload.schemas +%glib_compile_schemas %postun multiload %scrollkeeper_update_postun %post stickynotes %scrollkeeper_update_post -%gconf_schema_install stickynotes.schemas +%glib_compile_schemas %update_icon_cache hicolor %preun stickynotes -%gconf_schema_uninstall stickynotes.schemas +%glib_compile_schemas %postun stickynotes %scrollkeeper_update_postun @@ -569,169 +641,167 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/% %postun trash %scrollkeeper_update_postun -%files -f %{name}-2.0.lang +%files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%attr(755,root,root) %{_libdir}/null_applet -%{_libdir}/bonobo/servers/GNOME_CDPlayerApplet.server -%{_libdir}/bonobo/servers/GNOME_KeyboardApplet.server -%{_libdir}/bonobo/servers/GNOME_MailcheckApplet_Factory.server -%{_libdir}/bonobo/servers/GNOME_NullApplet_Factory.server -%{_libdir}/bonobo/servers/GNOME_Panel_WirelessApplet.server -%dir %{_libdir}/%{name} %dir %{_datadir}/%{name} %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 -%lang(es_CO) %dir %{_datadir}/locale/es_CO/LC_MESSAGES -%lang(es_CR) %dir %{_datadir}/locale/es_CR -%lang(es_CR) %dir %{_datadir}/locale/es_CR/LC_MESSAGES -%lang(es_DO) %dir %{_datadir}/locale/es_DO -%lang(es_DO) %dir %{_datadir}/locale/es_DO/LC_MESSAGES -%lang(es_EC) %dir %{_datadir}/locale/es_EC -%lang(es_EC) %dir %{_datadir}/locale/es_EC/LC_MESSAGES -%lang(es_GT) %dir %{_datadir}/locale/es_GT -%lang(es_GT) %dir %{_datadir}/locale/es_GT/LC_MESSAGES -%lang(es_HN) %dir %{_datadir}/locale/es_HN -%lang(es_HN) %dir %{_datadir}/locale/es_HN/LC_MESSAGES -%lang(es_PA) %dir %{_datadir}/locale/es_PA -%lang(es_PA) %dir %{_datadir}/locale/es_PA/LC_MESSAGES -%lang(es_PE) %dir %{_datadir}/locale/es_PE -%lang(es_PE) %dir %{_datadir}/locale/es_PE/LC_MESSAGES -%lang(es_PR) %dir %{_datadir}/locale/es_PR -%lang(es_PR) %dir %{_datadir}/locale/es_PR/LC_MESSAGES -%lang(es_SV) %dir %{_datadir}/locale/es_SV -%lang(es_SV) %dir %{_datadir}/locale/es_SV/LC_MESSAGES -%lang(es_UY) %dir %{_datadir}/locale/es_UY -%lang(es_UY) %dir %{_datadir}/locale/es_UY/LC_MESSAGES -%lang(es_VE) %dir %{_datadir}/locale/es_VE -%lang(es_VE) %dir %{_datadir}/locale/es_VE/LC_MESSAGES +%lang(es_CL) %dir %{_localedir}/es_CL +%lang(es_CL) %dir %{_localedir}/es_CL/LC_MESSAGES +%lang(es_CO) %dir %{_localedir}/es_CO +%lang(es_CO) %dir %{_localedir}/es_CO/LC_MESSAGES +%lang(es_CR) %dir %{_localedir}/es_CR +%lang(es_CR) %dir %{_localedir}/es_CR/LC_MESSAGES +%lang(es_DO) %dir %{_localedir}/es_DO +%lang(es_DO) %dir %{_localedir}/es_DO/LC_MESSAGES +%lang(es_EC) %dir %{_localedir}/es_EC +%lang(es_EC) %dir %{_localedir}/es_EC/LC_MESSAGES +%lang(es_GT) %dir %{_localedir}/es_GT +%lang(es_GT) %dir %{_localedir}/es_GT/LC_MESSAGES +%lang(es_HN) %dir %{_localedir}/es_HN +%lang(es_HN) %dir %{_localedir}/es_HN/LC_MESSAGES +%lang(es_PA) %dir %{_localedir}/es_PA +%lang(es_PA) %dir %{_localedir}/es_PA/LC_MESSAGES +%lang(es_PE) %dir %{_localedir}/es_PE +%lang(es_PE) %dir %{_localedir}/es_PE/LC_MESSAGES +%lang(es_PR) %dir %{_localedir}/es_PR +%lang(es_PR) %dir %{_localedir}/es_PR/LC_MESSAGES +%lang(es_SV) %dir %{_localedir}/es_SV +%lang(es_SV) %dir %{_localedir}/es_SV/LC_MESSAGES +%lang(es_UY) %dir %{_localedir}/es_UY +%lang(es_UY) %dir %{_localedir}/es_UY/LC_MESSAGES +%lang(es_VE) %dir %{_localedir}/es_VE +%lang(es_VE) %dir %{_localedir}/es_VE/LC_MESSAGES %files accessx-status -f accessx-status.lang %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/accessx-status-applet -%{_datadir}/dbus-1/services/org.gnome.panel.applet.AccessxStatusAppletFactory.service -%{_datadir}/gnome-2.0/ui/accessx-status-applet-menu.xml -%{_datadir}/gnome-panel/applets/org.gnome.applets.AccessxStatusApplet.panel-applet -%{_pixmapsdir}/accessx-status-applet -%{_iconsdir}/hicolor/48x48/apps/ax-applet.png +%{_datadir}/dbus-1/services/org.mate.panel.applet.AccessxStatusAppletFactory.service +%{_datadir}/mate-2.0/ui/accessx-status-applet-menu.xml +%{_datadir}/mate-panel/applets/org.mate.applets.AccessxStatusApplet.mate-panel-applet +%{_pixmapsdir}/mate-accessx-status-applet +%{_iconsdir}/mate/*/apps/ax-applet.png +%if 0 %files battstat -f battstat.lang %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/battstat-applet-2 -%{_datadir}/dbus-1/services/org.gnome.panel.applet.BattstatAppletFactory.service -%{_datadir}/gnome-2.0/ui/battstat-applet-menu.xml -%{_datadir}/gnome-panel/applets/org.gnome.applets.BattstatApplet.panel-applet +%{_datadir}/dbus-1/services/org.mate.panel.applet.BattstatAppletFactory.service +%{_datadir}/mate-2.0/ui/battstat-applet-menu.xml +%{_datadir}/mate-panel/applets/org.mate.applets.BattstatApplet.mate-panel-applet %{_datadir}/%{name}/builder/battstat_applet.ui -%{_sysconfdir}/gconf/schemas/battstat.schemas -%{_sysconfdir}/sound/events/battstat_applet.soundlist +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.battstat.gschema.xml +%{_sysconfdir}/sound/events/mate-battstat_applet.soundlist +%endif %files charpicker -f char-palette.lang %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/charpick_applet2 -%{_datadir}/dbus-1/services/org.gnome.panel.applet.CharpickerAppletFactory.service -%{_datadir}/gnome-2.0/ui/charpick-applet-menu.xml -%{_datadir}/gnome-panel/applets/org.gnome.applets.CharpickerApplet.panel-applet -%{_sysconfdir}/gconf/schemas/charpick.schemas +%{_datadir}/dbus-1/services/org.mate.panel.applet.CharpickerAppletFactory.service +%{_datadir}/mate-2.0/ui/charpick-applet-menu.xml +%{_datadir}/mate-panel/applets/org.mate.applets.CharpickerApplet.mate-panel-applet +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.charpick.gschema.xml -%files cpufreq -f cpufreq-applet.lang +%files cpufreq -f cpufreq.lang %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/cpufreq-selector -%attr(755,root,root) %{_libdir}/cpufreq-applet -%{_datadir}/dbus-1/services/org.gnome.panel.applet.CPUFreqAppletFactory.service -%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service -%{_datadir}/gnome-2.0/ui/cpufreq-applet-menu.xml -%{_datadir}/gnome-panel/applets/org.gnome.applets.CPUFreqApplet.panel-applet -%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy +%attr(755,root,root) %{_bindir}/mate-cpufreq-selector +%attr(755,root,root) %{_libdir}/mate-cpufreq-applet +/etc/dbus-1/system.d/org.mate.CPUFreqSelector.conf +%{_datadir}/dbus-1/system-services/org.mate.CPUFreqSelector.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.CPUFreqAppletFactory.service +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.cpufreq.gschema.xml +%{_datadir}/mate-panel/applets/org.mate.applets.CPUFreqApplet.mate-panel-applet +%{_datadir}/polkit-1/actions/org.mate.cpufreqselector.policy %{_datadir}/%{name}/builder/cpufreq-preferences.ui -/etc/dbus-1/system.d/org.gnome.CPUFreqSelector.conf -%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas -%{_pixmapsdir}/cpufreq-applet -%{_iconsdir}/hicolor/*/apps/gnome-cpu-frequency-applet.* +%{_datadir}/mate-2.0/ui/cpufreq-applet-menu.xml +#/etc/dbus-1/system.d/org.gnome.CPUFreqSelector.conf +#%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas +%{_pixmapsdir}/mate-cpufreq-applet +%{_iconsdir}/hicolor/*/apps/mate-cpu-frequency-applet.png +%{_iconsdir}/hicolor/*/apps/mate-cpu-frequency-applet.svg %files drivemount -f drivemount.lang %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/drivemount_applet2 -%{_datadir}/dbus-1/services/org.gnome.panel.applet.DriveMountAppletFactory.service -%{_datadir}/gnome-2.0/ui/drivemount-applet-menu.xml -%{_datadir}/gnome-panel/applets/org.gnome.applets.DriveMountApplet.panel-applet -%{_sysconfdir}/gconf/schemas/drivemount.schemas +%{_datadir}/dbus-1/services/org.mate.panel.applet.DriveMountAppletFactory.service +%{_datadir}/mate-2.0/ui/drivemount-applet-menu.xml +%{_datadir}/mate-panel/applets/org.mate.applets.DriveMountApplet.mate-panel-applet +#%{_sysconfdir}/gconf/schemas/drivemount.schemas %files geyes -f geyes.lang %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/geyes_applet2 -%{_datadir}/dbus-1/services/org.gnome.panel.applet.GeyesAppletFactory.service -%{_datadir}/gnome-2.0/ui/geyes-applet-menu.xml +%{_datadir}/dbus-1/services/org.mate.panel.applet.GeyesAppletFactory.service +%{_datadir}/mate-2.0/ui/geyes-applet-menu.xml %{_datadir}/%{name}/geyes -%{_datadir}/gnome-panel/applets/org.gnome.applets.GeyesApplet.panel-applet -%{_iconsdir}/hicolor/*/apps/gnome-eyes-applet.* -%{_sysconfdir}/gconf/schemas/geyes.schemas +%{_datadir}/mate-panel/applets/org.mate.applets.GeyesApplet.mate-panel-applet +%{_iconsdir}/hicolor/*/apps/mate-eyes-applet.* +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.geyes.gschema.xml %files gweather -f gweather.lang %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/gweather-applet-2 -%{_datadir}/dbus-1/services/org.gnome.panel.applet.GWeatherAppletFactory.service -%{_datadir}/gnome-2.0/ui/gweather-applet-menu.xml -%{_datadir}/gnome-panel/applets/org.gnome.applets.GWeatherApplet.panel-applet +%attr(755,root,root) %{_libdir}/mateweather-applet-2 +%{_datadir}/dbus-1/services/org.mate.panel.applet.MateWeatherAppletFactory.service +%{_datadir}/mate-2.0/ui/mateweather-applet-menu.xml +%{_datadir}/mate-panel/applets/org.mate.applets.MateWeatherApplet.mate-panel-applet %files invest -f invest-applet.lang %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/invest-chart +%attr(755,root,root) %{_bindir}/mate-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}/dbus-1/services/org.mate.panel.applet.InvestAppletFactory.service +%{_datadir}/%{name}/Invest_Applet.xml +%{_datadir}/mate-panel/applets/org.mate.applets.InvestApplet.mate-panel-applet %{_datadir}/%{name}/builder/financialchart.ui %{_datadir}/%{name}/builder/prefs-dialog.ui %{_datadir}/%{name}/invest-applet -%{_iconsdir}/hicolor/*/apps/invest-applet.* -%dir %{py_sitedir}/invest -%{py_sitedir}/invest/*.py[co] - -%files minicommander -f command-line.lang -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/mini_commander_applet -%attr(755,root,root) %{_libdir}/%{name}/mc-install-default-macros -%{_datadir}/dbus-1/services/org.gnome.panel.applet.MiniCommanderAppletFactory.service -%{_datadir}/gnome-2.0/ui/mini-commander-applet-menu.xml -%{_datadir}/%{name}/builder/mini-commander.ui -%{_datadir}/gnome-panel/applets/org.gnome.applets.MiniCommanderApplet.panel-applet -%{_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) -%attr(755,root,root) %{_libdir}/mixer_applet2 -%{_datadir}/dbus-1/services/org.gnome.panel.applet.MixerAppletFactory.service -%{_datadir}/gnome-2.0/ui/mixer-applet-menu.xml -%{_datadir}/gnome-panel/applets/org.gnome.applets.MixerApplet.panel-applet -%{_sysconfdir}/gconf/schemas/mixer.schemas +%{_iconsdir}/hicolor/*/apps/mate-invest-applet.* +%dir %{py_sitedir}/mate_invest +%{py_sitedir}/mate_invest/*.py[co] + +#%files minicommander -f command-line.lang +#%defattr(644,root,root,755) +#%attr(755,root,root) %{_libdir}/mini_commander_applet +#%attr(755,root,root) %{_libdir}/%{name}/mc-install-default-macros +#%{_datadir}/dbus-1/services/org.gnome.panel.applet.MiniCommanderAppletFactory.service +#%{_datadir}/mate-2.0/ui/mini-commander-applet-menu.xml +#%{_datadir}/%{name}/builder/mini-commander.ui +#%{_datadir}/mate-panel/applets/org.gnome.applets.MiniCommanderApplet.panel-applet +#%{_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) +#%attr(755,root,root) %{_libdir}/mixer_applet2 +#%{_datadir}/dbus-1/services/org.gnome.panel.applet.MixerAppletFactory.service +#%{_datadir}/mate-2.0/ui/mixer-applet-menu.xml +#%{_datadir}/mate-panel/applets/org.gnome.applets.MixerApplet.panel-applet +#%{_sysconfdir}/gconf/schemas/mixer.schemas %files multiload -f multiload.lang %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/multiload-applet-2 -%{_datadir}/dbus-1/services/org.gnome.panel.applet.MultiLoadAppletFactory.service -%{_datadir}/gnome-2.0/ui/multiload-applet-menu.xml -%{_datadir}/gnome-panel/applets/org.gnome.applets.MultiLoadApplet.panel-applet -%{_sysconfdir}/gconf/schemas/multiload.schemas +%{_datadir}/dbus-1/services/org.mate.panel.applet.MultiLoadAppletFactory.service +%{_datadir}/mate-2.0/ui/multiload-applet-menu.xml +%{_datadir}/mate-panel/applets/org.mate.applets.MultiLoadApplet.mate-panel-applet +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.multiload.gschema.xml %files stickynotes -f stickynotes_applet.lang %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/stickynotes_applet -%{_datadir}/dbus-1/services/org.gnome.panel.applet.StickyNotesAppletFactory.service -%{_datadir}/gnome-2.0/ui/stickynotes-applet-menu.xml +%{_datadir}/dbus-1/services/org.mate.panel.applet.StickyNotesAppletFactory.service +%{_datadir}/mate-2.0/ui/stickynotes-applet-menu.xml %{_datadir}/%{name}/builder/stickynotes.ui -%{_datadir}/gnome-panel/applets/org.gnome.applets.StickyNotesApplet.panel-applet -%{_pixmapsdir}/stickynotes -%{_iconsdir}/hicolor/*/apps/gnome-sticky-notes-applet.* -%{_sysconfdir}/gconf/schemas/stickynotes.schemas +%{_datadir}/mate-panel/applets/org.mate.applets.StickyNotesApplet.mate-panel-applet +%{_pixmapsdir}/mate-stickynotes +%{_iconsdir}/hicolor/*/apps/mate-sticky-notes-applet.* +%{_datadir}/glib-2.0/schemas/org.mate.stickynotes.gschema.xml %files trash -f trashapplet.lang %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/trashapplet -%{_datadir}/dbus-1/services/org.gnome.panel.applet.TrashAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.TrashAppletFactory.service %{_datadir}/%{name}/builder/trashapplet-empty-progress.ui -%{_datadir}/gnome-2.0/ui/trashapplet-menu.xml -%{_datadir}/gnome-panel/applets/org.gnome.applets.TrashApplet.panel-applet +%{_datadir}/mate-2.0/ui/trashapplet-menu.xml +%{_datadir}/mate-panel/applets/org.mate.applets.TrashApplet.mate-panel-applet diff --git a/mate-gnome-conflicts.patch b/mate-gnome-conflicts.patch new file mode 100644 index 0000000..1238043 --- /dev/null +++ b/mate-gnome-conflicts.patch @@ -0,0 +1,44 @@ +--- mate-applets-1.5.0/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in~ 2012-12-08 23:37:32.000000000 +0200 ++++ mate-applets-1.5.0/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in 2012-12-24 23:08:34.722100915 +0200 +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=org.mate.panel.applet.CPUFreqAppletFactory +-Exec=@LIBEXECDIR@/cpufreq-applet ++Exec=@LIBEXECDIR@/mate-cpufreq-applet +--- mate-applets-1.5.0/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in~ 2012-12-08 23:37:32.000000000 +0200 ++++ mate-applets-1.5.0/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in 2012-12-24 23:09:31.912661587 +0200 +@@ -1,6 +1,6 @@ + [Applet Factory] + Id=CPUFreqAppletFactory +-Location=@LIBEXECDIR@/cpufreq-applet ++Location=@LIBEXECDIR@/mate-cpufreq-applet + _Name=CPU Frequency Scaling Monitor + _Description=Monitor the CPU Frequency Scaling + +--- mate-applets-1.5.0/cpufreq/src/Makefile.am~ 2012-12-08 23:37:32.000000000 +0200 ++++ mate-applets-1.5.0/cpufreq/src/Makefile.am 2012-12-24 23:11:26.621571494 +0200 +@@ -10,13 +10,13 @@ + $(LIBGLADE_CFLAGS) \ + $(DBUS_CFLAGS) + +-libexec_PROGRAMS = cpufreq-applet ++libexec_PROGRAMS = mate-cpufreq-applet + + if HAVE_LIBCPUFREQ + cpufreq_files=cpufreq-monitor-libcpufreq.c cpufreq-monitor-libcpufreq.h + endif + +-cpufreq_applet_SOURCES = \ ++mate_cpufreq_applet_SOURCES = \ + cpufreq-applet.c cpufreq-applet.h \ + cpufreq-utils.c cpufreq-utils.h \ + cpufreq-prefs.c cpufreq-prefs.h \ +@@ -29,7 +29,7 @@ + $(cpufreq_files) \ + cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h + +-cpufreq_applet_LDADD = \ ++mate_cpufreq_applet_LDADD = \ + $(MATE_APPLETS4_LIBS) \ + $(LIBGLADE_LIBS) \ + $(LIBCPUFREQ_LIBS) \ -- 2.44.0