From df01f731f0e70990d38403cfc1fa8ccf1d34b58d Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Jan 13 2005 13:37:36 +0000
Subject: Improvements from Ville.


---

diff --git a/epydoc.spec b/epydoc.spec
index 95e6264..a8bf9cc 100644
--- a/epydoc.spec
+++ b/epydoc.spec
@@ -1,15 +1,19 @@
-# $Id: epydoc.spec,v 1.2 2004/11/16 17:37:28 thias Exp $
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary: Edward Loper's Python API documentation generation tool
 Name: epydoc
 Version: 2.1
-Release: 2
+Release: 3
 Group: Development/Tools
 License: MIT
 URL: http://epydoc.sourceforge.net/
-Source: http://dl.sf.net/epydoc/epydoc-%{version}.tar.gz
+Source0: http://dl.sf.net/epydoc/epydoc-%{version}.tar.gz
+Source1: epydocgui.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python
+Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires: tkinter
+BuildRequires: python desktop-file-utils
+BuildArch: noarch
 
 %description
 Epydoc  is a tool for generating API documentation for Python modules,
@@ -31,11 +35,18 @@ ReStructuredText, Javadoc, and plaintext.
 
 %install
 %{__rm} -rf %{buildroot}
-%{__python} setup.py install --root=%{buildroot}
+%{__python} setup.py install -O1 --skip-build --root=%{buildroot}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=%{buildroot}%{_datadir}/applications \
+  --mode=644 \
+  --add-category=X-Fedora \
+  %{SOURCE1}
 
 # Also install the man pages
-%{__install} -D man/epydoc.1    %{buildroot}%{_mandir}/man1/epydoc.1
-%{__install} -D man/epydocgui.1 %{buildroot}%{_mandir}/man1/epydocgui.1
+%{__install} -Dpm 644 man/epydoc.1    %{buildroot}%{_mandir}/man1/epydoc.1
+%{__install} -Dpm 644 man/epydocgui.1 %{buildroot}%{_mandir}/man1/epydocgui.1
 
 
 %clean
@@ -47,12 +58,32 @@ ReStructuredText, Javadoc, and plaintext.
 %doc LICENSE.TXT README.TXT doc/
 %{_bindir}/epydoc
 %{_bindir}/epydocgui
-%{_libdir}/python?.?/site-packages/epydoc/
+%dir %{python_sitelib}/epydoc
+%{python_sitelib}/epydoc/*.py
+%{python_sitelib}/epydoc/*.pyc
+%ghost %{python_sitelib}/epydoc/*.pyo
+%dir %{python_sitelib}/epydoc/markup
+%{python_sitelib}/epydoc/markup/*.py
+%{python_sitelib}/epydoc/markup/*.pyc
+%ghost %{python_sitelib}/epydoc/markup/*.pyo
+%dir %{python_sitelib}/epydoc/test
+%{python_sitelib}/epydoc/test/*.py
+%{python_sitelib}/epydoc/test/*.pyc
+%ghost %{python_sitelib}/epydoc/test/*.pyo
+%{_datadir}/applications/*epydocgui.desktop
 %{_mandir}/man1/epydoc.1*
 %{_mandir}/man1/epydocgui.1*
 
 
 %changelog
+* Mon Dec 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 2.1-3
+- Change to noarch.
+- Get Python site-packages dir from distutils, should fix x86_64 build.
+- Require python-abi and tkinter.
+- %%ghost'ify *.pyo.
+- Fix man page permissions.
+- Add menu entry for epydocgui.
+
 * Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 2.1-2
 - Bump release to provide Extras upgrade path.
 
diff --git a/epydocgui.desktop b/epydocgui.desktop
new file mode 100644
index 0000000..d503ffa
--- /dev/null
+++ b/epydocgui.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Epydoc
+Comment=Python API documentation generator
+Exec=epydocgui
+Type=Application
+Terminal=false
+Categories=Application;Development;