From 024acc27a2db80b45b68dd06d7fa784e00a6a54e Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Fri, 25 Feb 2011 10:57:06 +0200 Subject: [PATCH 1/2] Update to 4.4.1p1. --- PyMca.spec | 35 ++++++++++++++++++++++++++++------- sources | 2 +- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 914cd1f..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.4.0 -Release: 2%{?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) @@ -33,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 @@ -51,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 @@ -87,6 +99,15 @@ rm -rf %{buildroot} %{_datadir}/applications/PyMca.desktop %changelog +* Fri Feb 25 2011 Jussi Lehtola - 4.4.1-3.p1 +- Update to 4.4.1p1. + +* Mon Feb 07 2011 Fedora Release Engineering - 4.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Dec 10 2010 Jussi Lehtola - 4.4.1-1 +- Update to 4.4.1. + * Wed Jul 21 2010 David Malcolm - 4.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild diff --git a/sources b/sources index eb96592..0d16862 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c82ce73220c0f3d585dd800478730102 pymca4.4.0-src.tgz +92d77e55975c27c8693356a567e95d28 pymca4.4.1p1-src.tgz From 5cf72c02510cd4da42cd9e97bc255d1de0ae8557 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Thu, 14 Jul 2011 15:11:10 +0300 Subject: [PATCH 2/2] Fix binary permissions. --- PyMca.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 01b94b3..b045c93 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -10,7 +10,7 @@ Name: PyMca Version: 4.4.1 -Release: 3.%{plevel}%{?dist} +Release: 4.%{plevel}%{?dist} Summary: GUI for multi-channel analyser spectra visualization and analysis Group: Applications/Engineering License: GPLv2+ @@ -64,9 +64,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} # 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 + sed 's|%{buildroot}||g' $bin > $bin.new && \ + touch -r $bin $bin.new && \ + mv $bin.new $bin && \ chmod 755 $bin done @@ -81,7 +81,6 @@ for lib in %{buildroot}%{python_sitearch}/PyMca/*.py; do mv $lib.new $lib done - %clean rm -rf %{buildroot} @@ -99,6 +98,9 @@ rm -rf %{buildroot} %{_datadir}/applications/PyMca.desktop %changelog +* Thu Jul 14 2011 Jussi Lehtola - 4.4.1-4.p1 +- Fix binary permissions (BZ #721149). + * Fri Feb 25 2011 Jussi Lehtola - 4.4.1-3.p1 - Update to 4.4.1p1.