Update to latest stable release

- BZ 910689 - dependency on bitstream-vera-sans-fonts changed to dejavu-sans-fonts
- BZ 960856 - Missing dependency: bitstream-vera-sans-fonts
- BZ 747421 - Move CGI executable from /usr/sbin to /usr/libexec
- BZ 796344 - Not compatible with JDK7
- BZ 846543 - mapserver-java is incorrectly packaged (missing required native library)
- trim of changelog
This commit is contained in:
Pavel Lisý 2013-05-21 16:34:21 +02:00
commit e79059ea31
3 changed files with 120 additions and 248 deletions

8
.gitignore vendored
View File

@ -1,3 +1,5 @@
/mapserver-6.0.3.tar.gz
/mapserver-6.0.3-for-swig_2.0.4_up.patch
/mapserver-6.0.3-php4.patch
/mapserver-6.2.0.tar.gz
/mapserver62-6.2.0-java-62.patch
/mapserver62-6.2.0-perl-62.patch
/mapserver62-6.2.0-python-62.patch
/mapserver-6.2.1.tar.gz

View File

@ -1,17 +1,20 @@
%define MS_REL %{nil}
Name: mapserver%{MS_REL}
Version: 6.0.3
Release: 7%{?dist}
Version: 6.2.1
Release: 1%{?dist}
Summary: Environment for building spatially-enabled internet applications
Group: Development/Tools
License: BSD
URL: http://www.mapserver.org
Source: http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
Patch0: mapserver-6.0.3-for-swig_2.0.4_up.patch
Patch1: mapserver-6.0.3-php4.patch
Source0: http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
%if 0%{MS_REL}
Patch0: %{name}-%{version}-java-%{MS_REL}.patch
Patch1: %{name}-%{version}-perl-%{MS_REL}.patch
Patch2: %{name}-%{version}-python-%{MS_REL}.patch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -21,10 +24,10 @@ Requires: dejavu-sans-fonts
BuildRequires: libXpm-devel readline-devel
BuildRequires: httpd-devel php-devel libxslt-devel pam-devel fcgi-devel
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: postgresql-devel mysql-devel swig > 1.3.24
# BuildRequires: java java-devel
BuildRequires: postgresql-devel mysql-devel java-devel
BuildRequires: swig > 1.3.24 java
BuildRequires: geos-devel proj-devel gdal-devel agg-devel cairo-devel
BuildRequires: php-devel freetype-devel gd-devel >= 2.0.16
BuildRequires: freetype-devel gd-devel >= 2.0.16
BuildRequires: python-devel curl-devel zlib-devel libxml2-devel
BuildRequires: libjpeg-devel libpng-devel libtiff-devel fribidi-devel giflib-devel
@ -40,7 +43,10 @@ custom GIS data.
%package -n php-%{name}
Summary: PHP/Mapscript map making extensions to PHP
Group: Development/Languages
Requires: httpd php-gd
BuildRequires: php-devel
Requires: php-gd%{?_isa}
Requires: php(zend-abi) = %{php_zend_api}
Requires: php(api) = %{php_core_api}
%description -n php-%{name}
The PHP/Mapscript extension provides full map customization capabilities within
@ -66,37 +72,30 @@ Requires: %{name} = %{version}-%{release}
The Python/Mapscript extension provides full map customization capabilities
within the Python programming language.
# %package java
# Summary: Java/Mapscript map making extensions to Java
# Group: Development/Languages
# Requires: %{name} = %{version}-%{release}
# Requires: java-gcj-compat
#
# %description java
# The Java/Mapscript extension provides full map customization capabilities
# within the Java programming language.
%package java
Summary: Java/Mapscript map making extensions to Java
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: java-gcj-compat
%description java
The Java/Mapscript extension provides full map customization capabilities
within the Java programming language.
%prep
%setup -q
%if "%{fedora}" == "17" || "%{fedora}" == "18" || "%{fedora}" == "19"
%patch0 -p1 -b .swig
%patch1 -p1 -b .php4
%setup -q -n mapserver-%{version}
%if 0%{MS_REL}
%patch0 -p1 -b .java
%patch1 -p1 -b .perl
%patch2 -p1 -b .python
%endif
# fix spurious perm bits
chmod -x tests/home.png
chmod -x mapscript/php/php_mapscript.c
chmod -x mappluginlayer.c
chmod -x mapscript/php/mapscript_i.c
chmod -x mapscript/php/examples/test_writeshape.phtml
chmod -x mapscript/python/examples/*.py
chmod -x mapscript/python/tests/rundoctests.dist
chmod -x mapscript/perl/examples/*.pl
chmod -x mapscript/php/README
# remove fonts
# alias as symlinks
# replace fonts for tests with symlinks
rm -rf tests/vera/Vera.ttf
rm -rf tests/vera/VeraBd.ttf
pushd tests/vera/
@ -108,12 +107,12 @@ popd
CFLAGS="${CFLAGS} -ldl" ; export CFLAGS
# # fix a UTF-8 one
# iconv -f ISO-8859-1 -t UTF-8 < \
# mapscript/java/examples/QueryByAttributeUnicode.java > \
# mapscript/java/examples/QueryByAttributeUnicode-tmp.java
# mv -f mapscript/java/examples/QueryByAttributeUnicode-tmp.java \
# mapscript/java/examples/QueryByAttributeUnicode.java
# fix a UTF-8 one
iconv -f ISO-8859-1 -t UTF-8 < \
mapscript/java/examples/QueryByAttributeUnicode.java > \
mapscript/java/examples/QueryByAttributeUnicode-tmp.java
mv -f mapscript/java/examples/QueryByAttributeUnicode-tmp.java \
mapscript/java/examples/QueryByAttributeUnicode.java
# fix gdal lookup
%{__sed} -i.libs -e 's|`\$GDAL_CONFIG --dep-libs`||' configure
@ -140,7 +139,7 @@ CFLAGS="${CFLAGS} -ldl" ; export CFLAGS
--with-mygis=%{_bindir}/mysql_config \
--with-curl-config=%{_bindir}/curl-config \
--with-xml2-config=%{_bindir}/xml2-config \
--with-php=`php-config --include-dir` \
--with-php=%{_bindir}/php-config \
--with-fribidi-config=%{_libdir}/pkgconfig/fribidi.pc \
--with-fastcgi=/usr \
--without-pdf \
@ -160,6 +159,9 @@ make
# build perl
pushd mapscript/perl
%if 0%{MS_REL}
mv mapscript.pm mapscript%{MS_REL}.pm
%endif
perl Makefile.PL
make DESTDIR=%{buildroot} pure_vendor_install
popd
@ -169,11 +171,10 @@ pushd mapscript/python
python setup.py build
popd
# # build java
# pushd mapscript/java
# make interface JAVA_HOME=/etc/alternatives/java_sdk
# make JAVA_HOME=/etc/alternatives/java_sdk
# popd
# build java
pushd mapscript/java
make JAVA_HOME=/etc/alternatives/java_sdk
popd
%install
rm -rf %{buildroot}
@ -183,21 +184,23 @@ mkdir -p %{buildroot}/%{_sysconfdir}/php.d
mkdir -p %{buildroot}%{_libdir}/php/modules
mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}
install -p -m 755 mapserv %{buildroot}%{_libexecdir}/mapserv%{MS_REL}
install -p -m 755 legend %{buildroot}/%{_bindir}/legend%{MS_REL}
install -p -m 755 msencrypt %{buildroot}/%{_bindir}/msencrypt%{MS_REL}
install -p -m 755 scalebar %{buildroot}/%{_bindir}/scalebar%{MS_REL}
install -p -m 755 shp2img %{buildroot}/%{_bindir}/shp2img%{MS_REL}
install -p -m 755 shptree %{buildroot}/%{_bindir}/shptree%{MS_REL}
install -p -m 755 shptreetst %{buildroot}/%{_bindir}/shptreetst%{MS_REL}
install -p -m 755 shptreevis %{buildroot}/%{_bindir}/shptreevis%{MS_REL}
install -p -m 755 sortshp %{buildroot}/%{_bindir}/sortshp%{MS_REL}
install -p -m 755 tile4ms %{buildroot}/%{_bindir}/tile4ms%{MS_REL}
install -p -m 755 .libs/mapserv %{buildroot}%{_libexecdir}/mapserver%{MS_REL}
install -p -m 755 .libs/legend %{buildroot}/%{_bindir}/legend%{MS_REL}
install -p -m 755 .libs/msencrypt %{buildroot}/%{_bindir}/msencrypt%{MS_REL}
install -p -m 755 .libs/scalebar %{buildroot}/%{_bindir}/scalebar%{MS_REL}
install -p -m 755 .libs/shp2img %{buildroot}/%{_bindir}/shp2img%{MS_REL}
install -p -m 755 .libs/shptree %{buildroot}/%{_bindir}/shptree%{MS_REL}
install -p -m 755 .libs/shptreetst %{buildroot}/%{_bindir}/shptreetst%{MS_REL}
install -p -m 755 .libs/shptreevis %{buildroot}/%{_bindir}/shptreevis%{MS_REL}
install -p -m 755 .libs/sortshp %{buildroot}/%{_bindir}/sortshp%{MS_REL}
install -p -m 755 .libs/tile4ms %{buildroot}/%{_bindir}/tile4ms%{MS_REL}
install -p -m 755 .libs/libmapserver-%{version}.so %{buildroot}%{_libdir}/
install -p -m 644 xmlmapfile/mapfile.xsd %{buildroot}%{_datadir}/%{name}
install -p -m 644 xmlmapfile/mapfile.xsl %{buildroot}%{_datadir}/%{name}
install -p -m 755 mapscript/php/php_mapscript.so %{buildroot}/%{_libdir}/php/modules/php_mapscript%{MS_REL}.so
install -p -m 755 mapscript/php/.libs/php_mapscript-%{version}.so %{buildroot}/%{_libdir}/php/modules/php_mapscript%{MS_REL}.so
# install perl module
pushd mapscript/perl
@ -209,10 +212,10 @@ pushd mapscript/python
python setup.py install --root %{buildroot}
popd
# # install java
# mkdir -p %{buildroot}%{_javadir}
# install -p -m 644 mapscript/java/mapscript%{MS_REL}.jar %{buildroot}%{_javadir}/
# install -p -m 755 mapscript/java/.libs/libjavamapscript-%{version}.so %{buildroot}%{_libdir}/
# install java
mkdir -p %{buildroot}%{_javadir}
install -p -m 644 mapscript/java/mapscript%{MS_REL}.jar %{buildroot}%{_javadir}/
install -p -m 755 mapscript/java/.libs/libjavamapscript-%{version}.so %{buildroot}%{_libdir}/
# install php config file
mkdir -p %{buildroot}%{_sysconfdir}/php.d/
@ -227,10 +230,7 @@ find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
done
# fix some exec bits
chmod 755 %{buildroot}/%{perl_vendorarch}/auto/mapscript%{MS_REL}/mapscript%{MS_REL}.so
%clean
rm -rf %{buildroot}
chmod 755 %{buildroot}%{perl_vendorarch}/auto/mapscript%{MS_REL}/mapscript%{MS_REL}.so
%files
%defattr(-,root,root)
@ -238,20 +238,20 @@ rm -rf %{buildroot}
%doc INSTALL MIGRATION_GUIDE.txt
%doc symbols tests
%doc fonts
/%{_bindir}/legend%{MS_REL}
/%{_bindir}/msencrypt%{MS_REL}
/%{_bindir}/scalebar%{MS_REL}
/%{_bindir}/shp2img%{MS_REL}
/%{_bindir}/shptree%{MS_REL}
/%{_bindir}/shptreetst%{MS_REL}
/%{_bindir}/shptreevis%{MS_REL}
/%{_bindir}/sortshp%{MS_REL}
/%{_bindir}/tile4ms%{MS_REL}
%{_libexecdir}/mapserv%{MS_REL}
%{_bindir}/legend%{MS_REL}
%{_bindir}/msencrypt%{MS_REL}
%{_bindir}/scalebar%{MS_REL}
%{_bindir}/shp2img%{MS_REL}
%{_bindir}/shptree%{MS_REL}
%{_bindir}/shptreetst%{MS_REL}
%{_bindir}/shptreevis%{MS_REL}
%{_bindir}/sortshp%{MS_REL}
%{_bindir}/tile4ms%{MS_REL}
%{_libdir}/libmapserver-%{version}.so
%{_libexecdir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%files -n php-%{name}
%defattr(-,root,root)
%doc mapscript/php/README
@ -273,17 +273,46 @@ rm -rf %{buildroot}
%doc mapscript/python/tests
%{python_sitearch}/*
# %files java
# %defattr(-,root,root)
# %doc mapscript/java/README
# %doc mapscript/java/examples
# %doc mapscript/java/tests
# %{_javadir}/*.jar
%files java
%defattr(-,root,root)
%doc mapscript/java/README
%doc mapscript/java/examples
%doc mapscript/java/tests
%{_javadir}/*.jar
%{_libdir}/libjavamapscript-%{version}.so
%changelog
* Mon May 20 2013 Pavel Lisý <pali@fedoraproject.org> - 6.0.3-7
- BZ 910689: dependency on bitstream-vera-sans-fonts changed to dejavu-sans-fonts
- BZ 747421: Move CGI executable from /usr/sbin to /usr/libexec
* Tue May 21 2013 Pavel Lisý <pali@fedoraproject.org> - 6.2.1-1
- Update to latest stable release
- BZ 910689 - dependency on bitstream-vera-sans-fonts changed to dejavu-sans-fonts
- BZ 960856 - Missing dependency: bitstream-vera-sans-fonts
- BZ 747421 - Move CGI executable from /usr/sbin to /usr/libexec
- BZ 796344 - Not compatible with JDK7
- BZ 846543 - mapserver-java is incorrectly packaged (missing required native library)
- trim of changelog
* Tue Apr 09 2013 Pavel Lisý <pali@fedoraproject.org> - 6.2.0-2
- changed MS_REL from 6x to 62
* Thu Apr 04 2013 Pavel Lisý <pali@fedoraproject.org> - 6.2.0-1
- Update to latest stable release
- dependency on bitstream-vera-sans-fonts replaced to dejavu-sans-fonts
* Mon Mar 25 2013 Oliver Falk <oliver@linux-kernel.at> - 6.0.3-10.1
- Rebuild - fix changelog (bogus date)
* Sat Mar 23 2013 Remi Collet <rcollet@redhat.com> - 6.0.3-10
- rebuild for http://fedoraproject.org/wiki/Features/Php55
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 6.0.3-8
- rebuild due to "jpeg8-ABI" feature drop
* Fri Oct 26 2012 Remi Collet <remi@fedoraproject.org> - 6.0.3-7
- conform to PHP Guidelines (#828161)
- add minimal load test for php extension
* Tue Oct 16 2012 Pavel Lisý <pali@fedoraproject.org> - 6.0.3-6
- temporary removed mapserver-java (mapscript) due to build problem
@ -331,163 +360,3 @@ rm -rf %{buildroot}
http://trac.osgeo.org/mapserver/browser/tags/rel-6-0-1/mapserver/HISTORY.TXT
- Fixes bz #722545
- Apply changes to spec file for new major version.
* Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 5.6.5-6
- Perl mass rebuild
* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 5.6.5-5
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sun Jan 30 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.6.5-3
- Fix VeraBd symlink (trivial fix requested by Volker Fröhlich)
* Thu Jan 27 2011 Oliver Falk <oliver@linux-kernel.at> - 5.6.5-2
- Rebuild against new kerberos and new perl
* Mon Jul 26 2010 Devrim GÜNDÜZ <devrim@gunduz.org> - 5.6.5-1
- Update to 5.6.5, for various fixes described at:
http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-5/mapserver/HISTORY.TXT
Also fixes CVE-2010-2539, CVE-2010-2540, per bz #617301 and #617312.
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 5.6.3-3
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 5.6.3-2
- Mass rebuild with perl-5.12.0
* Tue Mar 23 2010 Devrim GÜNDÜZ <devrim@gunduz.org> - 5.6.3-1
- Update to 5.6.3, for various fixes described at:
http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-3/mapserver/HISTORY.TXT
* Thu Mar 18 2010 Balint Cristian <cristian.balint@gmail.com> - 5.6.1-3
- fix bz#538198
- enable fastcgi
* Thu Mar 18 2010 Balint Cristian <cristian.balint@gmail.com> - 5.6.1-2
- fix bz#555480
- enable cairo
* Sun Jan 10 2010 Devrim GUNDUZ <devrim@commandprompt.com> - 5.6.1-1
- Update to 5.6.1, for various fixes described at:
http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-1/mapserver/HISTORY.TXT
* Fri Dec 25 2009 Devrim GUNDUZ <devrim@commandprompt.com> - 5.6.0-1
- Update to 5.6.0
* Fri Dec 4 2009 Devrim GUNDUZ <devrim@commandprompt.com> - 5.6.0-rc1-1
- Update to 5.6.0-rc1, which includes fixes described in:
http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-0-rc1/mapserver/HISTORY.TXT
* Mon Aug 31 2009 Devrim GUNDUZ <devrim@commandprompt.com> - 5.4.2-1
- Update to 5.4.2, which fixes CVE-2009-0840 and various fixes
described in :
http://trac.osgeo.org/mapserver/browser/tags/rel-5-4-2/mapserver/HISTORY.TXT
* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 5.4.1-3
- rebuilt with new openssl
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Jun 17 2009 Devrim GUNDUZ <devrim@commandprompt.com> - 5.4.1-1
- Update to 5.4.1
* Sun Apr 26 2009 Devrim GUNDUZ <devrim@commandprompt.com> - 5.4.0-1
- Update to 5.4.0
* Sun Apr 5 2009 Devrim GUNDUZ <devrim@commandprompt.com> - 5.2.2-1
- Update to 5.2.2 which fixes :
CVE-2009-0839, CVE-2009-0840, CVE-2009-0841, CVE-2009-0842,
CVE-2009-0843, CVE-2009-1176, CVE-2009-1177.
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Wed Feb 11 2009 Balint Cristian <cristian.balint@gmail.com> - 5.2.1-6
- fix vera font requirement
* Thu Feb 05 2009 Balint Cristian <cristian.balint@gmail.com> - 5.2.1-5
- fix email typo
- rebuild
* Thu Jan 29 2009 Balint Cristian <cristian.balint@gmail.com> - 5.2.1-4
- email change
- rebuild against new gdal
* Sat Jan 03 2009 Balint Cristian <rezso@rdsor.ro> 5.2.1-3
- require external fonts
- get rid of internal fonts
* Sun Dec 07 2008 Balint Cristian <rezso@rdsor.ro> 5.2.1-2
- enable agg render engine
- enable fribidi renderer
- build require agg-devel fribidi-devel
* Mon Dec 01 2008 Balint Cristian <rezso@rdsor.ro> 5.2.1-1
- new stable upstream
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 5.2.0-2
- Rebuild for Python 2.6
* Wed Jul 23 2008 Balint Cristian <rezso@rdsor.ro> 5.2.0-1
- new 5.2 series upstream
* Sat Jul 05 2008 Balint Cristian <rezso@rdsor.ro> 5.0.3-3
- address bz#453925
* Thu Jun 26 2008 Devrim GUNDUZ <devrim@commandprompt.com> - 5.0.3-2
- Rebuilt against Geos 3.0.0
* Thu Jun 12 2008 Balint Cristian <rezso@rdsor.ro> 5.0.3-1
- update to 5.0.3 bugfix release
- fix some rpmlint warnings
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5.0.2-2
- Autorebuild for GCC 4.3
* Sat Feb 9 2008 Devrim GUNDUZ <devrim@commandprompt.com> - 5.0.2-1
- Update to 5.0.2
* Sat Jan 5 2008 Devrim GUNDUZ <devrim@commandprompt.com> - 5.0.0-2
- Update BR for java-devel, per Patrice Dumas
* Fri Jan 4 2008 Devrim GUNDUZ <devrim@commandprompt.com> - 5.0.0-1
- Update to 5.0.0
- Removed patch0, since it is already in upstream.
- Updated BRs
* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 4.10.3-3
- Rebuild for deps
* Thu Aug 30 2007 Oliver Falk <oliver@linux-kernel.at> 4.10.3-2
- Add fix to include libmapserver (in some places), instead of
libmap, that doesn't exist (anymore)
* Thu Aug 30 2007 Oliver Falk <oliver@linux-kernel.at> 4.10.3-1
- Update to fix bz#256561, CVE-2007-4542
* Fri May 11 2007 Balint Cristian <cbalint@redhat.com> 4.10.2-4
- update require list properly.
* Thu May 10 2007 Balint Cristian <cbalint@redhat.com> 4.10.2-3
- use macros if possible in spec
* Thu May 10 2007 Balint Cristian <cbalint@redhat.com> 4.10.2-2
- further fixups for inclusion
* Thu May 10 2007 Balint Cristian <cbalint@redhat.com> 4.10.2-1
- new upsream tarball (bugfix)
- further fixups for inclusion
* Tue Apr 24 2007 Balint Cristian <cbalint@redhat.com> 4.10.1-3
- further fixups for inclusion
- enable java
* Fri Mar 16 2007 Balint Cristian <cbalint@redhat.com> 4.10.1-2
- add docs
* Fri Mar 16 2007 Balint Cristian <cbalint@redhat.com> 4.10.1-1
- first package

View File

@ -1,3 +1,4 @@
bd1e46195fdc236d9766d2c56030c12b mapserver-6.0.3-for-swig_2.0.4_up.patch
035a14531f3c100ff7031e212b2b3f38 mapserver-6.0.3-php4.patch
0d2ad6f56e8a1b5755e856a54f90071c mapserver-6.0.3.tar.gz
8c48991dc54a307076b1fb670bc59ef9 mapserver-6.2.1.tar.gz
fa37273acda5765370cdfc72ceb0b77c mapserver62-6.2.0-java-62.patch
0cdac065125d80fc3e0e970c7e12745d mapserver62-6.2.0-perl-62.patch
d3d8abdc6a1b6c416b0afe13c34f5399 mapserver62-6.2.0-python-62.patch