[python-visual/f13/master] Merge from master:
tomspur
tomspur at fedoraproject.org
Tue Nov 30 14:20:46 UTC 2010
commit be745ba86eaa6a7971dfa96de0c56f1b10d68c56
Author: Thomas Spura <tomspur at fedoraproject.org>
Date: Tue Nov 30 15:20:17 2010 +0100
Merge from master:
- use corrent filter_setup (thanks to Kalev Lember)
- update to new version
- add disabled python3 subpackage
- disable filter_setup (#657851)
- fix the 64-bit architectures list
.gitignore | 2 +-
python-visual.spec | 112 +++++++++++++++++++++++++++++++++++++++++++++++-----
sources | 2 +-
3 files changed, 104 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dd93f44..d453d30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/visual-5.32_release.tar.bz2
+/visual-5.4_release.tar.bz2
diff --git a/python-visual.spec b/python-visual.spec
index 89008b6..370e7ce 100644
--- a/python-visual.spec
+++ b/python-visual.spec
@@ -2,23 +2,30 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
+%if 0%{?fedora} > 12
+# python3-numpy is only in f15 yet
+%global with_python3 0
+%endif
%{?filter_setup:
%filter_provides_in %{python_sitearch}/.*\.so*
-%filter_requires_in %{python_sitearch}/.*\.so*
+%filter_from_requires /cvisualmodule\.so/d
%filter_setup
}
+%global upst_version 5.4
+
Name: python-visual
-Version: 5.32
-Release: 10%{?dist}
+Version: 5.40
+Release: 2%{?dist}
Summary: 3D Programming
Group: Development/Languages
# See license.txt file for clarification
License: Boost and MIT
URL: http://vpython.org
-Source0: http://vpython.org/contents/download/visual-%{version}_release.tar.bz2
+#Source0: http://vpython.org/contents/download/visual-%{version}_release.tar.bz2
+Source0: http://vpython.org/contents/download/visual-%{upst_version}_release.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: boost-devel
@@ -26,14 +33,35 @@ BuildRequires: gtkglextmm-devel
BuildRequires: libglademm24-devel
BuildRequires: python2-devel
BuildRequires: numpy
-
-#See: https://bugzilla.redhat.com/show_bug.cgi?id=580984
-Requires: gtkglextmm-devel
+%if 0%{?with_python3}
+BuildRequires: python3-devel
+BuildRequires: python3-numpy
+%endif
Obsoletes: vpython < %{version}
Provides: vpython = %{version}
+%if 0%{?with_python3}
+%package -n python3-visual
+Summary: 3D Programming
+Group: Development/Languages
+%description -n python3-visual
+Visual Python makes it easy to create navigable 3D displays and animations,
+even for those with limited programming experience. Because it is based on
+Python, it also has much to offer for experienced programmers and researchers.
+
+
+%package -n python3-visual-doc
+Summary: Documentation and examples for %{name}
+Group: Documentation
+BuildArch: noarch
+
+%description -n python3-visual-doc
+Documentation and examples for developing with %{name}
+
+%endif # with_python3
+
%description
Visual Python makes it easy to create navigable 3D displays and animations,
even for those with limited programming experience. Because it is based on
@@ -50,7 +78,8 @@ Documentation and examples for developing with %{name}
%prep
-%setup -q -n visual-%{version}_release
+%setup -q -n visual-%{upst_version}_release
+#setup -q -n visual-%{version}_release
#rm -r dependencies
sed -i 's/\r//' \
@@ -59,24 +88,62 @@ sed -i 's/\r//' \
# make the build more verbose, with deleting all redirections to log file
sed -i 's/2\?>> \?\$(LOGFILE).*//' src/Makefile.in
+sed -i 's/boost_thread/boost_thread-mt/g' src/Makefile.in
+
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif
+
%build
+%if 0%{?with_python3}
+pushd %{py3dir}
%configure --with-html-dir=%{_defaultdocdir}/%{name}-doc-%{version}
-
# remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+CFLAGS="%{optflags}" make %{?_smp_mflags}
+popd
+%endif # with_python3
+%configure --with-html-dir=%{_defaultdocdir}/%{name}-doc-%{version}
+# remove rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
CFLAGS="%{optflags}" make %{?_smp_mflags}
%install
rm -rf %{buildroot}
+%if 0%{?with_python3}
+pushd %{py3dir}
make install DESTDIR=%{buildroot} INSTALL="install -p"
%ifarch x86_64 ppc64
# files are in wrong folder
+mkdir -p %{buildroot}%{python3_sitearch}
+mv %{buildroot}%{python3_sitelib}/* %{buildroot}%{python3_sitearch}
+%endif
+
+
+find %{buildroot}%{python3_sitearch} -name '*.la' | xargs rm -f
+
+# remove installed examples and docs, they go into -doc in %%files section
+rm -r %{buildroot}%{python3_sitearch}/visual/examples
+rm -r %{buildroot}%{_docdir}/*
+
+# IDLE is not packaged in fedora, delete vpython excecuable
+rm -f %{buildroot}%{_bindir}/vpython
+%endif # with_python3
+
+
+
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+
+%ifarch x86_64 ppc64 s390x sparc64
+# files are in wrong folder
mkdir -p %{buildroot}%{python_sitearch}
mv %{buildroot}%{python_sitelib}/* %{buildroot}%{python_sitearch}
%endif
@@ -96,10 +163,24 @@ rm -f %{buildroot}%{_bindir}/vpython
rm -rf %{buildroot}
+%if 0%{?with_python3}
+%files -n python3-visual
+%defattr(-,root,root,-)
+%doc license.txt authors.txt NEWS.txt
+%{python3_sitearch}/vis
+%{python3_sitearch}/visual
+
+
+%files -n python3-visual-doc
+%defattr(-,root,root,-)
+%doc examples docs/index.html docs/visual
+
+%endif # with_python3
+
%files
%defattr(-,root,root,-)
%doc license.txt authors.txt NEWS.txt
-%{python_sitearch}/cvisualmodule.so*
+%{python_sitearch}/vis
%{python_sitearch}/visual
@@ -109,6 +190,17 @@ rm -rf %{buildroot}
%changelog
+* Tue Nov 30 2010 Thomas Spura <tomspur at fedoraproject.org> - 5.40-2
+- use corrent filter_setup (thanks to Kalev Lember)
+
+* Tue Nov 30 2010 Thomas Spura <tomspur at fedoraproject.org> - 5.40-1
+- update to new version
+- add disabled python3 subpackage
+- disable filter_setup (#657851)
+
+* Wed Nov 24 2010 Dan Horák <dan[at]danny.cz> - 5.32-11
+- fix the 64-bit architectures list
+
* Mon Nov 15 2010 Thomas Spura <tomspur at fedoraproject.org> - 5.32-10
- add BR gtkglextmm-devel workaround for #580984
diff --git a/sources b/sources
index 35d5912..bed16b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-866f51f0c49b60086dbe3581f508d30b visual-5.32_release.tar.bz2
+a3c404bc01bac1f30704a78514311877 visual-5.4_release.tar.bz2
More information about the scm-commits
mailing list