[pycam] 0.5.1-2, fixes for Fedora review from Richard Shaw

John Morris zultron at fedoraproject.org
Wed May 8 15:24:57 UTC 2013


commit 506faacb547ada642a258ba69a8cb208b48a0b86
Author: John Morris <john at zultron.com>
Date:   Wed May 1 02:39:10 2013 -0500

    0.5.1-2, fixes for Fedora review from Richard Shaw
    
    BR python2-devel
    Add icons
    Add man page

 pycam.spec |   41 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 38 insertions(+), 3 deletions(-)
---
diff --git a/pycam.spec b/pycam.spec
index d6717b4..010a80f 100644
--- a/pycam.spec
+++ b/pycam.spec
@@ -1,6 +1,6 @@
 Name:           pycam
 Version:        0.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open Source CAM - Toolpath Generation for 3-Axis CNC machining 
 Group:          Applications/Engineering
 License:        GPLv3+
@@ -9,13 +9,15 @@ BuildArch:      noarch
 
 Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 BuildRequires:  ccache
 BuildRequires:  desktop-file-utils
 
 Requires:       PyOpenGL
 Requires:       pygtk2
 Requires:       pygtkglext
+# Needed because it owns the icon directories
+Requires:       hicolor-icon-theme
 
 
 %description
@@ -57,16 +59,49 @@ for lib in `find . -path "*.py"`; do
 done
 popd
 
+# Install icons
+install -pD -m 0644 share/mime/application-sla.svg \
+	%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/pycam.svg
+install -pD -m 0644 share/mime/icons/32x32/application-sla.png \
+	%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/pycam.png
+install -pD -m 0644 share/mime/icons/64x64/application-sla.png \
+	%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/pycam.png
+install -pD -m 0644 share/mime/icons/128x128/application-sla.png \
+	%{buildroot}%{_datadir}/icons/hicolor/128x128/apps/pycam.png
+
+# Install man page
+install -pD -m 0644 man/pycam.1 %{buildroot}%{_mandir}/man1/pycam.1
+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files 
-%doc *.TXT *.txt Changelog PKG-INFO
+%doc Changelog COPYING.TXT LICENSE.TXT PKG-INFO README.TXT
 %{_datadir}/%{name}/
 %{_bindir}/%{name}
 %{_datadir}/applications/pycam.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_mandir}/man1/%{name}.1.*
 %{python_sitelib}/*
 
 
 %changelog
+* Wed May  1 2013 John Morris <john at zultron.com> - 0.5.1-2
+- More fixes for Fedora review from Richard Shaw
+-   BR python2-devel
+-   Add icons
+-   Add man page
+
 * Thu Apr  4 2013 John Morris <john at zultron.com> - 0.5.1-1
 - Use pycam.desktop from upstream; remove Source1
 - Cleanups for Fedora review


More information about the scm-commits mailing list