diff --git a/mapserver.spec b/mapserver.spec index d0083b8..c2bc2c9 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -11,7 +11,7 @@ Requires: php Requires: postgresql Requires: mysql Requires: FastCGI -#Requires: python +Requires: python Requires: apache2 %if 0%{?suse_version} != 1010 BuildRequires: xorg-x11-libXpm-devel @@ -27,7 +27,7 @@ BuildRequires: readline-devel BuildRequires: freetype2-devel BuildRequires: gd-devel >= 2.0.16 BuildRequires: FastCGI-devel -#BuildRequires: python-devel +BuildRequires: python-devel %if 0%{?suse_version} >= 1030 BuildRequires: libcurl-devel BuildRequires: php-devel @@ -62,7 +62,7 @@ Patch0: mapserver-5.4.1_buildchecks.patch Patch1: hidden_layer.patch Patch2: bug3525_verbose_output.patch -#%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") +%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") %define _cgibindir /srv/www/cgi-bin %description @@ -90,14 +90,14 @@ Requires: %{name} = %{version}-%{release} The Perl/Mapscript extension provides full map customization capabilities within the Perl programming language. -#%package python -#Summary: Python/Mapscript map making extensions to Python -#Group: Development/Languages -#Requires: %{name} = %{version}-%{release} -# -#%description python -#The Python/Mapscript extension provides full map customization capabilities -#within the Python programming language. +%package python +Summary: Python/Mapscript map making extensions to Python +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description python +The Python/Mapscript extension provides full map customization capabilities +within the Python programming language. %package java Summary: Java/Mapscript map making extensions to Java @@ -121,7 +121,7 @@ chmod -x mapscript/php3/mapscript_i.c chmod -x mapscript/php3/Makefile.in chmod -x mapscript/php3/Makefile.vc chmod -x mapscript/php3/php_mapscript.* -#chmod -x mapscript/python/examples/*.py +chmod -x mapscript/python/examples/*.py chmod -x mapscript/perl/examples/*.pl chmod -x mapscript/php3/README.WIN32 @@ -174,8 +174,8 @@ perl Makefile.PL make ## build python -#cd ../python -#python setup.py build +cd ../python +python setup.py build # build java cd ../java @@ -205,18 +205,15 @@ pushd mapscript/perl make DESTDIR=%{buildroot} pure_vendor_install popd -## install python module -#pushd mapscript/python -#python setup.py install --root %{buildroot} -## WORKARROUND: only for python 2.4 -#mkdir -p %{buildroot}%{python_sitearch}/ -#cp build/lib.linux-i686-2.4/mapscript.py %{buildroot}%{python_sitearch}/ -#cp build/lib.linux-i686-2.4/_mapscript.so %{buildroot}%{python_sitearch}/ -## clean up after installing -#rm -f %{buildroot}/usr/local/python2.4/site-packages/mapscript.py -#rm -f %{buildroot}/usr/local/python2.4/site-packages/mapscript.pyc -#rm -f %{buildroot}/usr/local/python2.4/site-packages/_mapscript.so -#popd +# install python module +pushd mapscript/python +python setup.py install --root %{buildroot} +mkdir -p %{buildroot}%{python_sitearch}/ +mv %{buildroot}/usr/local/%{_lib}/python%py_ver/site-packages/*mapscript* %{buildroot}/usr/%{_lib}/python%py_ver/site-packages/ +%if 0%{?suse_version} > 1110 || 0%{?sles_version} > 10 + mv %{buildroot}/usr/local/%{_lib}/python%py_ver/site-packages/MapScript* %{buildroot}/usr/%{_lib}/python%py_ver/site-packages/ +%endif +popd # install java mkdir -p %{buildroot}%{_javadir} @@ -271,15 +268,12 @@ rm -rf %{buildroot} %{perl_vendorarch}/auto/mapscript/* %{perl_vendorarch}/mapscript.pm -#%files python -#%defattr(-,root,root) -#%doc mapscript/python/README -#%doc mapscript/python/examples -#%doc mapscript/python/tests -## FIXME -## packages are built here but should go to python_sitearch -##/usr/local/lib64/python2.5/site-packages/* -#%{python_sitearch}/* +%files python +%defattr(-,root,root) +%doc mapscript/python/README +%doc mapscript/python/examples +%doc mapscript/python/tests +%{python_sitearch}/* %files java %defattr(-,root,root) @@ -289,11 +283,13 @@ rm -rf %{buildroot} %{_javadir}/*.jar %changelog +* Sun Feb 27 2011 Angelos Tzotsos 5.6.6 +- fixed python package * Mon Jan 24 2011 Stephan Holl 5.6.6 - added bug3525_verbose_output.patch to make EXCEPTIONS-output more verbose * Tue Jan 18 2011 Stephan Holl 5.6.6 -- udated to new upstream version of mapserver 5.6.6(see· +- udated to new upstream version of mapserver 5.6.6(see� http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-6/mapserver/HISTORY.TXT for a detailed description of the changes. - removed patch for bug #3525 since this is already included in upstreams