rpms/pytrainer/F-9 pytrainer-1.6.0.5-desktop-fixes.patch, NONE, 1.1 pytrainer.sh, NONE, 1.1 pytrainer.spec, 1.5, 1.6 pytrainer-libgtkmozembed.patch, 1.1, NONE

Douglas E. Warner silfreed at fedoraproject.org
Wed Sep 24 15:19:57 UTC 2008


Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4562

Modified Files:
	pytrainer.spec 
Added Files:
	pytrainer-1.6.0.5-desktop-fixes.patch pytrainer.sh 
Removed Files:
	pytrainer-libgtkmozembed.patch 
Log Message:
* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-2
- replacing environ hack patch with shell script
- adding patch to clean up desktop file


pytrainer-1.6.0.5-desktop-fixes.patch:

--- NEW FILE pytrainer-1.6.0.5-desktop-fixes.patch ---
Common subdirectories: pytrainer-1.6.0.5-orig/bin and pytrainer-1.6.0.5/bin
Common subdirectories: pytrainer-1.6.0.5-orig/extensions and pytrainer-1.6.0.5/extensions
Common subdirectories: pytrainer-1.6.0.5-orig/glade and pytrainer-1.6.0.5/glade
Common subdirectories: pytrainer-1.6.0.5-orig/locale and pytrainer-1.6.0.5/locale
Common subdirectories: pytrainer-1.6.0.5-orig/maps and pytrainer-1.6.0.5/maps
Common subdirectories: pytrainer-1.6.0.5-orig/plugins and pytrainer-1.6.0.5/plugins
Common subdirectories: pytrainer-1.6.0.5-orig/pytrainer and pytrainer-1.6.0.5/pytrainer
diff -ub pytrainer-1.6.0.5-orig/pytrainer.desktop pytrainer-1.6.0.5/pytrainer.desktop
--- pytrainer-1.6.0.5-orig/pytrainer.desktop	2008-08-31 15:02:46.000000000 -0400
+++ pytrainer-1.6.0.5/pytrainer.desktop	2008-09-24 10:46:45.000000000 -0400
@@ -5,5 +5,5 @@
 Name=pyTrainer sport training log
 Comment=The Free Sport Training Center
 Exec=pytrainer
-Icon=pytrainer.png
-Categories=Office
+Icon=pytrainer
+Categories=Office;


--- NEW FILE pytrainer.sh ---
#!/bin/bash
MOZILLA_FIVE_HOME="MOZLIBLOC" python PYTHONPATH/pytrainer.py $@


Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-9/pytrainer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pytrainer.spec	24 Sep 2008 13:52:57 -0000	1.5
+++ pytrainer.spec	24 Sep 2008 15:19:27 -0000	1.6
@@ -6,15 +6,17 @@
 
 Name: pytrainer
 Version: 1.6.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A tool to log all your sport excursions
 
 Group: Development/Languages
 License: GPLv2+
 URL: http://pytrainer.e-oss.net/
 Source0: http://www.e-oss.net/descargas/pytrainer/%{name}-%{version}.tar.gz
-Patch0: pytrainer-libgtkmozembed.patch
-Patch1: pytrainer-1.5.0.0.1-sqlite3.patch
+Source1: pytrainer.sh
+# http://sourceforge.net/tracker2/?func=detail&aid=2126411&group_id=213157&atid=1024592
+Patch0: pytrainer-1.5.0.0.1-sqlite3.patch
+Patch1: pytrainer-1.6.0.5-desktop-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -28,10 +30,6 @@
 %if 0%{fedora} >= 9
 Requires: xulrunner = %{xulrunner_pkgver}
 %endif
-#Requires: python-libxml
-#Requires: PyXML
-#Requires: pygtk2
-#Requires: pygtkglext
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
 
@@ -40,25 +38,22 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+
+%{__sed} -i 's|PYTHONPATH|%{python_sitelib}|' %{SOURCE1}
 
 # make patch work for current firefox version
 %if 0%{fedora} <= 8
-%{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{PATCH0}
+%{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{SOURCE1}
 %endif
 %if 0%{fedora} >= 9
-%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{PATCH0}
+%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{SOURCE1}
 %endif
-%patch0 -p1
-
-%patch1 -p1
 
 # fix non-exacutable scripts
-%{__chmod} +x extensions/wordpress/example.py
 %{__chmod} +x plugins/garmin-hr/gtrnctr2gpx.py
 
-# fix invalid EOL encoding
-%{__sed} -i 's/\r//' extensions/wordpress/example.py
-
 
 %build
 %{__python} setup.py build
@@ -68,6 +63,10 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
+# install our own executable to set proper lib dirs
+%{__mv} %{buildroot}%{_bindir}/%{name} %{buildroot}%{python_sitelib}/%{name}.py
+%{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
+
 desktop-file-install --vendor="fedora" --delete-original \
 	--dir=%{buildroot}/%{_datadir}/applications \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -90,6 +89,10 @@
 
 
 %changelog
+* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-2
+- replacing environ hack patch with shell script
+- adding patch to clean up desktop file
+
 * Mon Sep 15 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-1
 - updating to 1.6.0.5
 


--- pytrainer-libgtkmozembed.patch DELETED ---




More information about the fedora-extras-commits mailing list