[PythonCAD] - Switch project URL - Update to DS1-R37
Nicolas Chauvet
kwizart at fedoraproject.org
Mon Aug 22 20:27:12 UTC 2011
commit c789e2d05af4b05dcecdf7feca18e2615fa0a45b
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Mon Aug 22 22:26:37 2011 +0200
- Switch project URL
- Update to DS1-R37
.gitignore | 1 +
PythonCAD-DS1-R37-fix.patch | 24 ++++++++++++++++++++++
PythonCAD.desktop | 10 ---------
PythonCAD.spec | 47 ++++++++++++++++--------------------------
layer.py.patch | 26 -----------------------
sources | 2 +-
6 files changed, 44 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0945cb..a34eedd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
PythonCAD-DS1-R36.tar.bz2
+/PythonCAD-DS1-R37.tar.gz
diff --git a/PythonCAD-DS1-R37-fix.patch b/PythonCAD-DS1-R37-fix.patch
new file mode 100644
index 0000000..95c8075
--- /dev/null
+++ b/PythonCAD-DS1-R37-fix.patch
@@ -0,0 +1,24 @@
+diff -up PythonCAD-DS1-R37/PythonCAD/Interface/Gtk/gtkDialog.py.fix PythonCAD-DS1-R37/PythonCAD/Interface/Gtk/gtkDialog.py
+--- PythonCAD-DS1-R37/PythonCAD/Interface/Gtk/gtkDialog.py.fix 2009-12-09 11:14:36.000000000 +0100
++++ PythonCAD-DS1-R37/PythonCAD/Interface/Gtk/gtkDialog.py 2011-08-22 22:24:01.271272856 +0200
+@@ -107,7 +107,7 @@ def abautDialog():
+ _abautDialog.set_program_name("PythonCad")
+ _abautDialog.set_version("DS1-R37")
+ _abautDialog.set_comments("CAD built from Python")
+- _iconPath=os.path.join(os.getcwd(),"gtkpycad.png")
++ _iconPath="/usr/share/pixmaps/gtkpycad.png"
+ _pixBuf=gtk.gdk.pixbuf_new_from_file(_iconPath)
+ _abautDialog.set_logo(_pixBuf)
+ _abautDialog.set_website("http://sourceforge.net/projects/pythoncad")
+diff -up PythonCAD-DS1-R37/PythonCAD/Interface/Gtk/gtkimage.py.fix PythonCAD-DS1-R37/PythonCAD/Interface/Gtk/gtkimage.py
+--- PythonCAD-DS1-R37/PythonCAD/Interface/Gtk/gtkimage.py.fix 2009-12-09 10:28:58.000000000 +0100
++++ PythonCAD-DS1-R37/PythonCAD/Interface/Gtk/gtkimage.py 2011-08-22 22:13:55.900501527 +0200
+@@ -154,7 +154,7 @@ class GTKImage(object):
+ self.__image = image
+ self.__window = gtk.Window()
+ self.__window.set_title(image.filename)
+- self.__window.set_icon_from_file("gtkpycad.png")
++ self.__window.set_icon_from_file("/usr/share/pixmaps/gtkpycad.png")
+ self.__window.connect("destroy", self.__destroyEvent)
+ self.__window.connect("event", self.__windowEvent)
+ self.__window.connect("key_press_event", self.__keyPressEvent)
diff --git a/PythonCAD.spec b/PythonCAD.spec
index c395690..d87f4bf 100644
--- a/PythonCAD.spec
+++ b/PythonCAD.spec
@@ -4,18 +4,17 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define _version DS1-R36
+%define _version DS1-R37
Summary: Python scriptable CAD package
Name: PythonCAD
Version: %(echo %{_version} |sed 's|DS|0.|'|sed 's|-R|.|')
-Release: 10%{?dist}
+Release: 1%{?dist}
Group: Applications/Engineering
License: GPLv2+
-URL: http://www.pythoncad.org/
-Source0: http://www.pythoncad.org/releases/%{name}-%{_version}.tar.bz2
-Source1: %{name}.desktop
-Patch0: layer.py.patch
+URL: https://sourceforge.net/projects/pythoncad/
+Source0: http://www.pythoncad.org/releases/%{name}-%{_version}.tar.gz
+Patch0: PythonCAD-DS1-R37-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -38,46 +37,32 @@ December 21, 2002.
%prep
%setup -q -n %{name}-%{_version}
-%patch0 -p0 -b .reserved
+%patch0 -p1
-cp -p %{SOURCE1} .
%build
-
-## Build mo files
-for i in $(find po -name "*.po");do
-msgfmt -o $(echo $i|sed 's|.po|.mo|') $i
-done
+ %{__python} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --root=$RPM_BUILD_ROOT
+
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pythoncad
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-install -m 0755 -p gtkpycad.py $RPM_BUILD_ROOT%{_bindir}/gtkpycad
+install -m 0755 -p gtkpycad.py $RPM_BUILD_ROOT%{_bindir}/pythoncad
install -m 0644 -p prefs.py $RPM_BUILD_ROOT%{_sysconfdir}/pythoncad/
install -m 0644 -p gtkpycad.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
# E: PythonCAD non-executable-script - remove shebang or fix perm
# {python_sitelib}/PythonCAD/Generic/bindump.py 0644
-chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/PythonCAD/Generic/bindump.py
-
+#chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/PythonCAD/Generic/bindump.py
desktop-file-install --vendor="" \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- %{name}.desktop
-
-# Manual install .mo file
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
-for i in $(find po -name "*.mo");do
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/$(echo $i|sed 's|po/%{name}.||'|sed 's|.mo||')/LC_MESSAGES
-install -m 0644 $i $RPM_BUILD_ROOT%{_datadir}/locale/$(echo $i|sed 's|po/%{name}.||'|sed 's|.mo||')/LC_MESSAGES/%{name}.mo
-done
-
-%find_lang %{name}
+ pythoncad.desktop
%clean
@@ -92,21 +77,25 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-%files -f %{name}.lang
+%files
%defattr(-,root,root)
%doc COPYING NEWS README TODO
-%{_bindir}/gtkpycad
+%{_bindir}/pythoncad
%dir %{_sysconfdir}/pythoncad
# Do not uses (no replace) with prefs.py as users pref is used.
%config %{_sysconfdir}/pythoncad/prefs.py
%exclude %{_sysconfdir}/pythoncad/prefs.py?
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/pythoncad.desktop
%{_datadir}/pixmaps/gtkpycad.png
%{python_sitelib}/PythonCAD/
%{python_sitelib}/*.egg-info
%changelog
+* Mon Aug 22 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.1.37-1
+- Switch project URL
+- Update to DS1-R37
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.36-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 6dd0d54..543b020 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb8acab878aa5bc203a4b4d07dd3da71 PythonCAD-DS1-R36.tar.bz2
+f0515b53cd5a1a65ec32e74d715e1438 PythonCAD-DS1-R37.tar.gz
More information about the scm-commits
mailing list