rpms/desktop-printing/devel desktop-printing.spec, 1.86, 1.87 redhat-print-applet.desktop, 1.1, 1.2 eggcups.sh, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19753

Modified Files:
	desktop-printing.spec redhat-print-applet.desktop 
Removed Files:
	eggcups.sh 
Log Message:
* Tue Mar 27 2007 Tim Waugh <twaugh at redhat.com> 0.20-6
- Ship translations for applet desktop file.
- Don't ship the eggcups binary.



Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- desktop-printing.spec	21 Mar 2007 18:23:54 -0000	1.86
+++ desktop-printing.spec	27 Mar 2007 16:33:45 -0000	1.87
@@ -6,13 +6,12 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.20
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/File
 Source0: http://download.gnome.org/sources/eggcups/0.20/eggcups-%{version}.tar.bz2
 Source1: gnome-default-printer.png
-Source2: eggcups.sh
-Source3: redhat-print-applet.desktop
+Source2: redhat-print-applet.desktop
 # fixed in upstream svn
 Patch0: desktop-printing-0.20-category.patch
 Patch1: desktop-printing-0.20-dbus-close.patch
@@ -22,8 +21,7 @@
 Requires: dbus >= %{dbus_version}, dbus-x11
 Requires: hal-cups-utils >= 0.6.2-4
 Requires: cups
-Requires: pycups >= 1.9.18
-Requires: system-config-printer-libs >= 0.7.57
+Requires: system-config-printer-libs >= 0.7.60
 PreReq:   gtk2 >= %{gtk_version}
 
 BuildRequires: libgnomeui-devel
@@ -69,12 +67,12 @@
 
 echo "OnlyShowIn=GNOME;" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-default-printer.desktop
 
-# Use the Python implementation.
-install -p -m0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/eggcups
-
 # Autostart it.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart
-install -p -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
+install -p -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
+
+# Don't ship eggcups.
+rm -f $RPM_BUILD_ROOT%{_bindir}/eggcups
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,7 +92,6 @@
 
 %files -f eggcups.lang
 %defattr(-, root, root)
-%{_bindir}/eggcups
 %{_bindir}/gnome-default-printer
 %{_datadir}/eggcups
 %{_datadir}/applications/gnome-default-printer.desktop
@@ -104,6 +101,10 @@
 %{_sysconfdir}/xdg/autostart/*.desktop
 
 %changelog
+* Tue Mar 27 2007 Tim Waugh <twaugh at redhat.com> 0.20-6
+- Ship translations for applet desktop file.
+- Don't ship the eggcups binary.
+
 * Wed Mar 21 2007 Tim Waugh <twaugh at redhat.com> 0.20-5
 - Provide an autostart desktop file (bug #233261).
 


Index: redhat-print-applet.desktop
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/redhat-print-applet.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redhat-print-applet.desktop	21 Mar 2007 18:23:54 -0000	1.1
+++ redhat-print-applet.desktop	27 Mar 2007 16:33:45 -0000	1.2
@@ -1,10 +1,34 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Print queue applet
+Name[es]=Applet de la cola de impresión
+Name[fi]=Tulostusjonosovelma
+Name[gu]=છાપન કતાર એપ્લેટ
+Name[hr]=Aplet čekanja ispisa
+Name[it]=Applet coda di stampa
+Name[pl]=Aplet kolejki drukowania
+Name[pt]='Applet' da fila de impressão
+Name[pt_BR]=Applet de fila de Impressão
+Name[ru]=Апплет очереди печати 
+Name[sr]=Програмче за штампање реда
+Name[sr at Latn]=Programče za štampanje reda
+Name[uk]=Аплет черги друку
 Comment=System tray icon for managing print jobs
-Exec=/usr/bin/eggcups
+Comment[es]=Icono del area de notificación para administrar trabajos de impresión
+Comment[fi]=Ilmoitusalueen kuvake tulostustöiden hallintaan
+Comment[gu]=છાપન ક્રિયાઓની વ્યવસ્થા કરવા માટે સિસ્ટમ ટ્રે ચિહ્ન
+Comment[hr]=Ikona sistemske trake za upravljanje zadacima ispisivanja
+Comment[it]=Icona della system tray per gestire i lavori di stampa
+Comment[pl]=Ikona w obszarze powiadamiania do zarzÄ…dzania zadaniami wydruku
+Comment[pt]=Ícone da bandeja para gerir as tarefas de impressão
+Comment[pt_BR]=Icone no sistema de bandeja (tray) para gerenciamento de trabalhos de impressão.
+Comment[ru]=Иконка системного трея для управления заданиями печати
+Comment[sr]=Икона системске обавештајне зоне за управљање штампарским пословима
+Comment[sr at Latn]=Ikona sistemske obaveštajne zone za upravljanje štamparskim poslovima
+Comment[uk]=Значок у системній області для керування завданнями друку
+Exec=/usr/bin/system-config-printer-applet
 Terminal=false
 Type=Application
-Icon=/usr/share/eggcups/icon.png
+Icon=/usr/share/system-config-printer/applet.png
 X-Desktop-File-Install-Version=0.10
-Categories=Application;SystemSetup;X-Red-Hat-Base;
+Categories=GTK;TrayIcon;Monitor;System;X-Red-Hat-Base;


--- eggcups.sh DELETED ---