rpms/pytrainer/devel .cvsignore, 1.3, 1.4 pytrainer.sh, 1.1, 1.2 pytrainer.spec, 1.9, 1.10 sources, 1.3, 1.4 pytrainer-1.6.0.5-desktop-fixes.patch, 1.1, NONE

[Douglas E. Warner]

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9920

Modified Files:
	.cvsignore pytrainer.sh pytrainer.spec sources 
Removed Files:
	pytrainer-1.6.0.5-desktop-fixes.patch 
Log Message:
* Thu Feb 19 2009 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.6-1
- updating to 1.6.0.6 to incorporate one of my patches
- updating to point at correct location for xulrunner
- removing firefox support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Sep 2008 13:47:57 -0000	1.3
+++ .cvsignore	19 Feb 2009 20:48:42 -0000	1.4
@@ -1 +1 @@
-pytrainer-1.6.0.5.tar.gz
+pytrainer-1.6.0.6.tar.gz


Index: pytrainer.sh
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/devel/pytrainer.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pytrainer.sh	24 Sep 2008 15:14:38 -0000	1.1
+++ pytrainer.sh	19 Feb 2009 20:48:42 -0000	1.2
@@ -1,2 +1,13 @@
 #!/bin/bash
-MOZILLA_FIVE_HOME="MOZLIBLOC" python PYTHONPATH/pytrainer.py $@
+LIB_X=
+ARCH=$(uname -m)
+case $ARCH in
+	x86_64 | ia64 | s390 )
+		LIB_X="64"
+		;;
+esac
+
+MOZILLA_FIVE_HOME=LIBLOC$LIB_X/MOZLIBLOC
+export MOZILLA_FIVE_HOME
+
+python PYTHONPATH/pytrainer.py $@


Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/devel/pytrainer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pytrainer.spec	29 Nov 2008 18:25:46 -0000	1.9
+++ pytrainer.spec	19 Feb 2009 20:48:42 -0000	1.10
@@ -1,11 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define firefox_ver 2.0.0.14
 %define gecko_ver 1.9
 
 Name: pytrainer
-Version: 1.6.0.5
-Release: 4%{?dist}
+Version: 1.6.0.6
+Release: 1%{?dist}
 Summary: A tool to log all your sport excursions
 
 Group: Development/Languages
@@ -15,7 +14,6 @@
 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
 
@@ -23,12 +21,7 @@
 Requires: python-matplotlib
 Requires: gnome-python2-gtkmozembed
 Requires: SOAPpy
-%if 0%{fedora} <= 8
-Requires: firefox = %{firefox_ver}
-%endif
-%if 0%{fedora} >= 9
 Requires: gecko-libs >= %{gecko_ver}
-%endif
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
 
@@ -38,17 +31,12 @@
 %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}|' %{SOURCE1}
-%endif
-%if 0%{fedora} >= 9
-%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{gecko_ver}|' %{SOURCE1}
-%endif
+# make patch work for current xulrunner version
+%{__sed} -i 's|MOZLIBLOC|xulrunner-%{gecko_ver}|' %{SOURCE1}
+%{__sed} -i 's|LIBLOC|/usr/lib|' %{SOURCE1}
 
 # fix non-exacutable scripts
 %{__chmod} +x plugins/garmin-hr/gtrnctr2gpx.py
@@ -88,6 +76,11 @@
 
 
 %changelog
+* Thu Feb 19 2009 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.6-1
+- updating to 1.6.0.6 to incorporate one of my patches
+- updating to point at correct location for xulrunner
+- removing firefox support
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.6.0.5-4
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Sep 2008 13:47:57 -0000	1.3
+++ sources	19 Feb 2009 20:48:42 -0000	1.4
@@ -1 +1 @@
-0c1f6fd49456e901d22ce47d95dffedd  pytrainer-1.6.0.5.tar.gz
+bb3dcd030fee59ca0d4e88456f2e2fbc  pytrainer-1.6.0.6.tar.gz


--- pytrainer-1.6.0.5-desktop-fixes.patch DELETED ---