[gausssum] Update to 3.0
Christopher Meng
cicku at fedoraproject.org
Sat Jul 12 15:09:02 UTC 2014
commit 909cc2abbb2cdb2b4db44df5a3399b3ea476a933
Author: Christopher Meng <i at cicku.me>
Date: Sat Jul 12 23:09:08 2014 +0800
Update to 3.0
.gitignore | 1 +
gausssum.desktop | 4 +-
gausssum.spec | 86 +++++++++++++++++++++++++-----------------------------
sources | 2 +-
4 files changed, 44 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7a0af2c..5f30990 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ GaussSum-2.2.3.tar.gz
GaussSum-2.2.4.tar.gz
/GaussSum-2.2.5.tar.gz
/GaussSum-2.2.6.tar.gz
+/GaussSum-3.0.tar.gz
diff --git a/gausssum.desktop b/gausssum.desktop
index 571f34c..6db59c9 100644
--- a/gausssum.desktop
+++ b/gausssum.desktop
@@ -2,8 +2,8 @@
Name=GaussSum
GenericName=GaussSum
Comment=Analyze output of Quantum Chemistry packages
-Exec=GaussSum.py
+Exec=gausssum
Icon=GaussSum
Terminal=false
Type=Application
-Categories=Science;Education;Chemistry;Physics;DataVisualization;
+Categories=Science;Chemistry;Physics;DataVisualization;
diff --git a/gausssum.spec b/gausssum.spec
index d51e6a0..b5e0083 100644
--- a/gausssum.spec
+++ b/gausssum.spec
@@ -1,29 +1,19 @@
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
Name: gausssum
-Version: 2.2.6
-Release: 4%{?dist}
+Version: 3.0
+Release: 1%{?dist}
Summary: A GUI application for analysis of output of quantum computations
-Group: Applications/Engineering
License: GPLv2+
URL: http://gausssum.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/GaussSum-%{version}.tar.gz
Source1: gausssum.desktop
-# Patch to use system python-cclib instead of own copy
-Patch0: gausssum-cclib.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
-
-# For converting .ico into .png
-BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
-# We need this for python_sitelib to make sense
-BuildRequires: python-devel
-
+BuildRequires: ImageMagick
+BuildRequires: python3-devel
Requires: gnuplot
-Requires: numpy
-Requires: python-cclib
-Requires: python-imaging-tk
+Requires: python3-numpy
+Requires: python3-cclib
+Requires: python3-tkinter
%description
GaussSum is a GUI application that can analyze the output of ADF, GAMESS (US),
@@ -32,70 +22,74 @@ information. This includes the progress of the SCF cycles, geometry
optimization, UV-Vis/IR/Raman spectra, MO levels, MO contributions and more.
%prep
-%setup -q -n GaussSum-%{version}
-%patch0 -p1 -b .cclib
+%setup -qn GaussSum-%{version}
+# Correct the python shebang.
+sed -i 's|/usr/bin/env python|%{__python3}|' GaussSum.py
+
+# Remove the bundled cclib quotation.
+for file in `find . -type f`; do
+ sed -e 's|gausssum.cclib|cclib|g' $file > $file.new && \
+ touch -r $file $file.new && \
+ mv $file.new $file
+done
-# Change location of documentation
+# Change location of documentation.
sed 's|os\.path\.join(installlocation,"\.\.","Docs","index\.html")|"%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/index.html"|g' \
gausssum/gausssumgui.py > gausssum/gausssumgui.py.new && \
touch -r gausssum/gausssumgui.py gausssum/gausssumgui.py.new && \
mv gausssum/gausssumgui.py.new gausssum/gausssumgui.py
-# Fix gnuplot location
+# Fix gnuplot location.
sed 's|os.path.join(installlocation,"gnuplot400","bin","wgnuplot.exe")|"%{_bindir}/gnuplot"|g' \
gausssum/gausssumgui.py > gausssum/gausssumgui.py.new && \
touch -r gausssum/gausssumgui.py gausssum/gausssumgui.py.new && \
mv gausssum/gausssumgui.py.new gausssum/gausssumgui.py
-
-# Fix end of line encodings
+# Fix end of line encodings.
for file in Docs/style.css gausssum/*.py gausssum/cclib/*.py; do
sed -e 's|\r||g' $file > $file.new && \
touch -r $file $file.new && \
mv $file.new $file
done
-# Fix attributes
-find gausssum/ -name "*.py" -exec chmod 644 {} \;
+# Fix attributes.
+find gausssum/ -name "*.py" -exec chmod 644 {} + -print
chmod 644 Docs/mesh.gif Docs/style.css
-# Convert icon into png
+# Convert icon into png.
convert GaussSum.ico GaussSum.png
-# Remove integrated cclib
+# Remove integrated cclib.
rm -rf gausssum/cclib
%build
+# Nothing here.
%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{python_sitelib}
-# Install python library
-cp -a %{name} %{buildroot}%{python_sitelib}
+mkdir -p %{buildroot}%{python3_sitelib}
+# Install python library.
+cp -a %{name} %{buildroot}%{python3_sitelib}
# Install python executable itself
-install -D -p -m 755 GaussSum.py %{buildroot}%{_bindir}/GaussSum.py
-# Install icon
-install -D -p -m 644 GaussSum.png %{buildroot}%{_datadir}/pixmaps/GaussSum.png
-# Install desktop file
+install -pDm755 GaussSum.py %{buildroot}%{_bindir}/gausssum
+# Create symlink for pedantic name.
+ln -s %{_bindir}/GaussSum %{buildroot}%{_bindir}/gausssum
+# Install icon.
+install -pDm644 GaussSum.png %{buildroot}%{_datadir}/pixmaps/GaussSum.png
+# Install desktop file.
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%doc Docs/*
-%{_bindir}/GaussSum.py
-%{python_sitelib}/%{name}/
+%{_bindir}/gausssum
+%{python3_sitelib}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/GaussSum.png
-# Older rpm versions generate compiled Python objects in bindir
-%if 0%{?fedora} < 11
-%exclude %{_bindir}/GaussSum.pyc
-%exclude %{_bindir}/GaussSum.pyo
-%endif
%changelog
+* Tue Jun 10 2014 Christopher Meng <rpm at cicku.me> - 3.0-1
+- Update to 3.0(Python 3 switch!)
+- Remove binary suffix(.py -> NULL).
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 63c72ec..5ab7d84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-69a7c5b98cf44f7340d1ff801c7ba59e GaussSum-2.2.6.tar.gz
+4fe57843663e52a1e91676bb9e424b14 GaussSum-3.0.tar.gz
More information about the scm-commits
mailing list