From ce230e0f4de82e2d74156560fb1b0b7d4c75611d Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 15 Jun 2007 18:08:46 +0000 Subject: [PATCH] Fixed build. --- system-config-printer-trayicon.patch | 20 -------------------- system-config-printer.spec | 5 +++-- 2 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 system-config-printer-trayicon.patch diff --git a/system-config-printer-trayicon.patch b/system-config-printer-trayicon.patch deleted file mode 100644 index bae2995..0000000 --- a/system-config-printer-trayicon.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- system-config-printer-0.7.67/Makefile.am.trayicon 2007-06-08 17:39:31.000000000 +0100 -+++ system-config-printer-0.7.67/Makefile.am 2007-06-08 17:39:37.000000000 +0100 -@@ -64,7 +64,6 @@ - --add-category X-Red-Hat-Base \ - --add-category System \ - --add-category Monitor \ -- --add-category TrayIcon \ - --add-category GTK \ - print-applet.desktop - ---- system-config-printer-0.7.67/Makefile.in.trayicon 2007-06-08 17:39:43.000000000 +0100 -+++ system-config-printer-0.7.67/Makefile.in 2007-06-08 17:39:48.000000000 +0100 -@@ -880,7 +880,6 @@ - --add-category X-Red-Hat-Base \ - --add-category System \ - --add-category Monitor \ -- --add-category TrayIcon \ - --add-category GTK \ - print-applet.desktop - diff --git a/system-config-printer.spec b/system-config-printer.spec index 96d5566..6c2ffda 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -11,7 +11,6 @@ Source0: system-config-printer-%{version}.tar.bz2 Source1: pycups-%{pycups_version}.tar.bz2 Source2: system-config-printer.pam Source3: system-config-printer.console -Patch0: system-config-printer-trayicon.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -47,7 +46,6 @@ the configuration tool. %prep %setup -q -a 1 -%patch0 -p1 -b .trayicon pushd pycups-%{pycups_version} mkdir examples mv cupstree.py examples @@ -103,9 +101,11 @@ rm -rf $RPM_BUILD_ROOT %doc ChangeLog README NEWS TODO %{_bindir}/%{name} %{_bindir}/%{name}-applet +%{_bindir}/my-default-printer %{_sbindir}/%{name} %{_datadir}/%{name}/config.py* %{_datadir}/%{name}/cupsd.py* +%{_datadir}/%{name}/my-default-printer.py* %{_datadir}/%{name}/nametree.py* %{_datadir}/%{name}/options.py* %{_datadir}/%{name}/optionwidgets.py* @@ -116,6 +116,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/*.glade %{_datadir}/applications/redhat-system-config-printer.desktop %{_datadir}/applications/redhat-manage-print-jobs.desktop +%{_datadir}/applications/redhat-my-default-printer.desktop %{_sysconfdir}/pam.d/%{name} %{_sysconfdir}/security/console.apps/%{name} %{_mandir}/man1/*