[python-ase] Fix bug#1010479 comment 10

Marcin Dulak marcindulak at fedoraproject.org
Sat Nov 30 17:02:08 UTC 2013


commit dad48a3e07c61c3aecbedd70af6135a7ff87d8a0
Author: marcindulak <Marcin.Dulak at gmail.com>
Date:   Sat Nov 30 18:00:47 2013 +0100

    Fix bug#1010479 comment 10

 ase-gui.desktop |    2 +-
 python-ase.spec |   13 ++++++++++---
 sources         |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/ase-gui.desktop b/ase-gui.desktop
index 3c716e6..8b64976 100644
--- a/ase-gui.desktop
+++ b/ase-gui.desktop
@@ -4,7 +4,7 @@ Name=ase-gui
 GenericName=ase-gui
 Comment=Atomic Simulation Environment GUI
 Categories=GTK;Science;Chemistry;Physics;Education;
-Exec=ag
+Exec=ase-gui
 Icon=ase
 Terminal=false
 Type=Application
diff --git a/python-ase.spec b/python-ase.spec
index 0c399b4..ecbfad4 100644
--- a/python-ase.spec
+++ b/python-ase.spec
@@ -7,7 +7,7 @@
 
 Name:			python-ase
 Version:		3.8.1%{?upstream_svn}
-Release:		7%{?dist}
+Release:		8%{?dist}
 Summary:		Atomic Simulation Environment
 %{?el5:Group:		Applications/Scientific}
 
@@ -62,7 +62,7 @@ rm -rf doc
 
 # doc would go under $RPM_BUILD_ROOT%%{_datadir}/%%{name}
 # if only we get rid of povray dependency one could build doc with:
-# cd $RPM_BUILD_ROOT%%{_datadir}/%%{name}/doc&&  sphinx-build . _build
+# cd $RPM_BUILD_ROOT%%{_datadir}/%%{name}/doc&& sphinx-build . _build
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
@@ -97,7 +97,9 @@ sed -i "s|$RPM_BUILD_ROOT||g" %{PKG_TOP}/files.list
 
 
 %check
+PYTHONVERSION=`python -c "from distutils import sysconfig; print sysconfig.get_python_version()"`
 export PYTHONPATH=`pwd`/build/lib
+export PATH=`pwd`/build/scripts-${PYTHONVERSION}:${PATH}
 mkdir p2testase && cd p2testase
 %{__python} -c "from ase.test import test; test(verbosity=2, display=False)" 2>&1 | tee ../p2testase.log
 cd -
@@ -108,7 +110,7 @@ cd -
 
 
 %files -f files.list
-%doc *.log COPYING* LICENSE README.txt MANIFEST.in
+%doc *.log COPYING* LICENSE README.txt
 %{_bindir}/*
 %{?!el5:%{python_sitelib}/*.egg-info}
 %{_datadir}/applications/%{upstream_name}-gui.desktop
@@ -116,6 +118,11 @@ cd -
 
 
 %changelog
+* Sat Nov 30 2013 Marcin Dulak <Marcin.Dulak at gmail.com> - 3.8.1.3440-8
+- fix Exec in ase-gui.desktop
+- remove MANIFEST.in from %%doc 
+- PATH modified for tests to include scripts dir
+
 * Fri Nov 22 2013 Marcin Dulak <Marcin.Dulak at gmail.com> - 3.8.1.3440-7
 - new upstream version, old patches removed
 
diff --git a/sources b/sources
index ddf9182..0a0b096 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f2e424cd756b35be793c5595a355b6ac  ase-gui.desktop
+aa0c21cdbe5150c971442fd53f76f9a8  ase-gui.desktop
 86fa053caf169bfcdddbe7ac985d9740  python-ase-3.8.1.3440.tar.gz


More information about the scm-commits mailing list