[PyMca/f13/master] Update to 4.4.1p1.
Jussi Lehtola
jussilehtola at fedoraproject.org
Fri Feb 25 08:48:04 UTC 2011
commit f2c41860dcfc6e2d06cce11bda835f259d721786
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date: Fri Feb 25 10:48:09 2011 +0200
Update to 4.4.1p1.
PyMca.spec | 44 +++++++++++++++++++++++++++++++++++++-------
sources | 2 +-
2 files changed, 38 insertions(+), 8 deletions(-)
---
diff --git a/PyMca.spec b/PyMca.spec
index cb69c95..01b94b3 100644
--- a/PyMca.spec
+++ b/PyMca.spec
@@ -1,14 +1,21 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}.*\.so$
+%filter_setup
+}
+
+# Current patch level
+%define plevel p1
Name: PyMca
-Version: 4.3.0
-Release: 4%{?dist}
+Version: 4.4.1
+Release: 3.%{plevel}%{?dist}
Summary: GUI for multi-channel analyser spectra visualization and analysis
Group: Applications/Engineering
License: GPLv2+
URL: http://pymca.sourceforge.net/
-Source0: http://downloads.sourceforge.net/sourceforge/pymca/pymca%{version}-src.tgz
+Source0: http://downloads.sourceforge.net/sourceforge/pymca/pymca%{version}%{plevel}-src.tgz
# Desktop file
Source1: PyMca.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,6 +23,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: python-devel
BuildRequires: python-setuptools
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
# Needed for normal operations
BuildRequires: numpy
@@ -31,12 +40,16 @@ visualization and analysis. PyMca can display spectra from a file or directly
from SPEC during acquisitions.
%prep
-%setup -q -n %{name}%{version}
+%setup -q -n %{name}%{version}%{plevel}
# Fix perms
chmod 644 LICENSE.GPL README
find -name *.c -exec chmod 644 {} \;
find -name *.h -exec chmod 644 {} \;
+# Fix shebang on pymcapostbatch
+sed "s|#!python|#!%{_bindir}/python|g" -i PyMca/scripts/pymcapostbatch
+
+
%build
# setup.py asks for license approval
echo yes | python setup.py build
@@ -49,16 +62,17 @@ echo yes | python setup.py install -O1 --skip-build --root %{buildroot}
# Install desktop file
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
-# Get rid of buildroot in files in %{_bindir}
+# Get rid of mention of buildroot in files in %{_bindir}
for bin in %{buildroot}%{_bindir}/*; do
sed 's|%{buildroot}||g' $bin > $bin.new &&
touch -r $bin $bin.new &&
mv $bin.new $bin
+ chmod 755 $bin
done
-# Fix library permissions
+# Get rid of spurious executable rights
find %{buildroot}%{python_sitearch}/PyMca/ -type f -exec chmod 644 {} \;
-chmod 755 %{buildroot}%{python_sitearch}/PyMca/*.so
+find %{buildroot}%{python_sitearch}/PyMca/ -name *.so -exec chmod 755 {} \;
# Get rid of /usr/bin/env in libraries
for lib in %{buildroot}%{python_sitearch}/PyMca/*.py; do
@@ -81,9 +95,25 @@ rm -rf %{buildroot}
%{_bindir}/mca2edf
%{_bindir}/peakidentifier
%{_bindir}/pymca*
+%{_bindir}/rgbcorrelator
%{_datadir}/applications/PyMca.desktop
%changelog
+* Fri Feb 25 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.4.1-3.p1
+- Update to 4.4.1p1.
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Dec 10 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.4.1-1
+- Update to 4.4.1.
+
+* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 4.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Sat Jun 19 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.4.0-1
+- Update to 4.4.0.
+
* Fri Oct 30 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.3.0-4
- Keep time stamps also on binfiles.
diff --git a/sources b/sources
index 09fc6ac..0d16862 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9d986a14899fecf38e5214c5712d409 pymca4.3.0-src.tgz
+92d77e55975c27c8693356a567e95d28 pymca4.4.1p1-src.tgz
More information about the scm-commits
mailing list