rpms/system-config-printer/devel system-config-printer.spec, 1.8, 1.9

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30080

Modified Files:
	system-config-printer.spec 
Log Message:
* Thu May  4 2006 Tim Waugh <twaugh at redhat.com>
- Desktop file.
- Requires PyXML.



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- system-config-printer.spec	28 Apr 2006 08:32:57 -0000	1.8
+++ system-config-printer.spec	4 May 2006 17:17:52 -0000	1.9
@@ -8,16 +8,19 @@
 Group: System Environment/Base
 Source0: system-config-printer-%{version}.tar.bz2
 Source1: pycups-%{pycups_version}.tar.bz2
+Source2: system-config-printer.desktop
 
 %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel
+BuildRequires: desktop-file-utils >= 0.2.92
 PreReq: python, python-abi = %{pyver}
 PreReq: rhpl >= 0.81
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Requires: pygtk2 >= 2.4.0, pygtk2-libglade
+Requires: PyXML
 
 Obsoletes: system-config-printer-gui <= 0.6.152
 
@@ -46,6 +49,15 @@
 chmod 755 %buildroot%{_datadir}/%{name}/%{name}.py
 install -m0755 %{name} %buildroot%{_bindir}/
 
+# Desktop file installation.
+mkdir $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor redhat \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
+  --add-category X-Red-Hat-Base                        \
+  --add-category SystemSetup                           \
+  --add-category Application                           \
+  %{SOURCE2}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,8 +68,13 @@
 %{_libdir}/python*/*/*.so
 %{_bindir}/%{name}
 %{_datadir}/%{name}
+%{_datadir}/applications/redhat-system-config-printer.desktop
 
 %changelog
+* Thu May  4 2006 Tim Waugh <twaugh at redhat.com>
+- Desktop file.
+- Requires PyXML.
+
 * Fri Apr 28 2006 Tim Waugh <twaugh at redhat.com>
 - Make it actually run.