From f370c1bc9d8696b540b41c675d2656683b8ac565 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 31 Oct 2009 23:50:37 +0000 Subject: [PATCH 1/3] Initialize branch F-11 for PyMca --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 6b983c58ba91579e949fd6def25bfe8a0b1211a2 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Thu, 7 Jan 2010 07:24:24 +0000 Subject: [PATCH 2/3] Import from rawhide branch. --- PyMca.desktop | 8 +++++ PyMca.spec | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 108 insertions(+) create mode 100644 PyMca.desktop create mode 100644 PyMca.spec diff --git a/PyMca.desktop b/PyMca.desktop new file mode 100644 index 0000000..493c7c6 --- /dev/null +++ b/PyMca.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=PyMca +Comment=A collection of Python tools for visualization and analysis of energy-dispersive X-ray fluorescence data +Exec=pymca +Terminal=false +Type=Application +Categories=Education;Science;DataVisualization;Physics; diff --git a/PyMca.spec b/PyMca.spec new file mode 100644 index 0000000..cb69c95 --- /dev/null +++ b/PyMca.spec @@ -0,0 +1,99 @@ +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + + +Name: PyMca +Version: 4.3.0 +Release: 4%{?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 +# Desktop file +Source1: PyMca.desktop +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: desktop-file-utils +BuildRequires: python-devel +BuildRequires: python-setuptools + +# Needed for normal operations +BuildRequires: numpy +BuildRequires: PyQt4 +BuildRequires: PyQwt +Requires: numpy +Requires: PyQt4 +Requires: PyQwt + +%description +PyMCA provides a graphical interface for multi-channel analyser spectra +visualization and analysis. PyMca can display spectra from a file or directly +from SPEC during acquisitions. + +%prep +%setup -q -n %{name}%{version} +# Fix perms +chmod 644 LICENSE.GPL README +find -name *.c -exec chmod 644 {} \; +find -name *.h -exec chmod 644 {} \; + +%build +# setup.py asks for license approval +echo yes | python setup.py build + +%install +rm -rf %{buildroot} +# setup.py asks for license approval +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} +for bin in %{buildroot}%{_bindir}/*; do + sed 's|%{buildroot}||g' $bin > $bin.new && + touch -r $bin $bin.new && + mv $bin.new $bin +done + +# Fix library permissions +find %{buildroot}%{python_sitearch}/PyMca/ -type f -exec chmod 644 {} \; +chmod 755 %{buildroot}%{python_sitearch}/PyMca/*.so + +# Get rid of /usr/bin/env in libraries +for lib in %{buildroot}%{python_sitearch}/PyMca/*.py; do + sed '/\/usr\/bin\/env/d' $lib > $lib.new && + touch -r $lib $lib.new && + mv $lib.new $lib +done + + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc LICENSE.GPL README +%{python_sitearch}/PyMca/ +%{python_sitearch}/PyMca-%{version}-py*.egg-info/ +%{_bindir}/edfviewer +%{_bindir}/elementsinfo +%{_bindir}/mca2edf +%{_bindir}/peakidentifier +%{_bindir}/pymca* +%{_datadir}/applications/PyMca.desktop + +%changelog +* Fri Oct 30 2009 Jussi Lehtola - 4.3.0-4 +- Keep time stamps also on binfiles. + +* Fri Oct 30 2009 Jussi Lehtola - 4.3.0-3 +- Added BR: python-devel. +- Added desktop file. + +* Fri Oct 30 2009 Jussi Lehtola - 4.3.0-2 +- Keep time stamps during sed of libraries. +- Changed BR: python-setuptools-devel to python-setuptools-devel. + +* Thu Oct 08 2009 Jussi Lehtola - 4.3.0-1 +- First release. diff --git a/sources b/sources index e69de29..09fc6ac 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +e9d986a14899fecf38e5214c5712d409 pymca4.3.0-src.tgz From 8ec0b8d1090eee7035ea2616bbaa9c6da6d561eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:11:48 +0000 Subject: [PATCH 3/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 656f421..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: PyMca -# $Id$ -NAME := PyMca -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11