# HG changeset patch
# User Mads Kiilerich <m...@kiilerich.com>
# Date 1246573262 -7200
# Node ID 845208e671eb1c5a5fc9499247fd94840faa2a8b
# Parent  ecf6fc1b0c9fd11e8ffe314c68ee75752371ac5f
Update rpm spec to match the "official" 0.8 rpms

The only difference is now the version number ...

diff --git a/contrib/rpm.sh b/contrib/rpm.sh
--- a/contrib/rpm.sh
+++ b/contrib/rpm.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 mkdir -p rpmbuild/{SOURCES,BUILD}
-hg archive -t tgz rpmbuild/SOURCES/tortoisehg-hg.tgz
+hg archive -t tgz rpmbuild/SOURCES/tortoisehg-hg.tar.gz
 rpmbuild --define "_topdir $(pwd)/rpmbuild" -ba $(dirname $0)/tortoisehg.spec
 rm -rf rpmbuild/BUILD/
 ls -l rpmbuild/{RPMS/*,SRPMS}/tortoisehg-*.rpm
diff --git a/contrib/tortoisehg.spec b/contrib/tortoisehg.spec
--- a/contrib/tortoisehg.spec
+++ b/contrib/tortoisehg.spec
@@ -9,10 +9,10 @@
 Group:         Development/Tools
 License:       GPLv2
 URL:           http://bitbucket.org/tortoisehg/stable/wiki/
-Source0:       tortoisehg-hg.tgz
+Source0:       tortoisehg-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
-Requires:      python >= 2.4, mercurial >= 1.1.2, gnome-python2-gconf
+Requires:      python >= 2.4, mercurial >= 1.3, gnome-python2-gconf
 Requires:      gnome-python2-gtksourceview, pycairo, pygobject2, pygtk2 >= 2.10
 
 %description
@@ -30,7 +30,10 @@
 system available in the file manager with a graphical interface. 
 
 %prep
-%setup -q -n tortoisehg-hg
+%setup -q -n tortoisehg-%{version}
+
+# Fix for nautilus python extensions in lib64 on x86_64
+sed -i "s,lib/nautilus,%{_lib}/nautilus,g" setup.py
 
 cat > thgutil/config.py << EOT
 bin_path     = "%{_bindir}"

------------------------------------------------------------------------------
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop

Reply via email to