[gresistor] 710199.

[Jon Ciesla]

commit 7c1725c90ef4a78859ae4b7428977bcaa6865e28
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Aug 4 08:03:41 2011 -0500

    710199.

 gresistor.spec |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/gresistor.spec b/gresistor.spec
index 02ef59d..9aa5bfa 100644
--- a/gresistor.spec
+++ b/gresistor.spec
@@ -2,7 +2,7 @@
 
 Name:             gresistor
 Version:          0.0.1
-Release:          18%{?dist}
+Release:          19%{?dist}
 Summary:          Gnome resistor color code calculator
 
 License:          GPL+
@@ -17,6 +17,7 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    python-devel desktop-file-utils
 
 Requires:         pygtk2-libglade
+Requires:         tepache
 
 %description
 To allow for identification, resistors are usually marked with
@@ -28,13 +29,17 @@ translate a resistor color codes into a readable value.
 %prep
 %setup -q
 
+# Remove bundled SimpleGladeApp.py
+rm -f SimpleGladeApp.py
+sed -i '/py_modules =/d' setup.py
+
 %patch0 -p0 -b %{name}.desktop
 
 %build
 %{__python} setup.py build
 
 %install
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 desktop-file-install --vendor fedora            \
@@ -43,12 +48,13 @@ desktop-file-install --vendor fedora            \
     --dir %{buildroot}%{_datadir}/applications/ \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-%{__mv} %{buildroot}%{_datadir}/%{name}/icon.png \
-        %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+pushd %{buildroot}%{_datadir}/%{name}
+ln -s icon.png ../icons/hicolor/48x48/apps/%{name}.png
+popd
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -66,10 +72,13 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
-%{python_sitelib}/SimpleGladeApp.py*
 %{python_sitelib}/%{name}-%{version}-py?.?.egg-info
 
 %changelog
+* Mon Jul 25 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.0.1-19
+- Removed bundled library, SimpleGladeApp.py now that is has been packaged for fedora (#710199)
+- Created symlink instead of moving icon.png because the app expects it to be there and generates an error if it's not present.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild