[mapserver/el6] BZ 910689 - dependency on bitstream-vera-sans-fonts changed to dejavu-sans-fonts

Pavel Lisý pali at fedoraproject.org
Wed May 22 15:41:03 UTC 2013 

commit 6225552a71271d8a430583ba23f77d3bcfe5f1f4
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Wed May 22 17:40:40 2013 +0200

    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 846543 - mapserver-java is incorrectly packaged (missing required native library)
    - trim of changelog

 mapserver.spec |  293 ++++++++++++++++++++++++++------------------------------
 1 files changed, 136 insertions(+), 157 deletions(-)
---
diff --git a/mapserver.spec b/mapserver.spec
index e57870b..08993ac 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -1,14 +1,25 @@
-Name:           mapserver
+%define MS_REL %{nil}
+
+Name:           mapserver%{MS_REL}
 Version:        6.0.3
-Release:        4%{?dist}
+Release:        11%{?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
+
+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)
+
 Requires:       httpd
-Requires:       bitstream-vera-sans-fonts
+Requires:       dejavu-sans-fonts
 
 BuildRequires:  libXpm-devel readline-devel
 BuildRequires:  httpd-devel php-devel libxslt-devel pam-devel fcgi-devel
@@ -16,7 +27,7 @@ BuildRequires:  perl(ExtUtils::MakeMaker)
 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
 
@@ -29,12 +40,15 @@ map images in real time. With appropriate interface pages,
 Mapserver can provide an interactive internet map based on 
 custom GIS data.
 
-%package -n php-mapserver
+%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-mapserver
+%description -n php-%{name}
 The PHP/Mapscript extension provides full map customization capabilities within
 the PHP scripting language.
 
@@ -69,7 +83,12 @@ The Java/Mapscript extension provides full map customization capabilities
 within the Java programming language.
 
 %prep
-%setup -q
+%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
@@ -82,13 +101,12 @@ 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/
-ln -sf /usr/share/fonts/bitstream-vera/Vera.ttf Vera.ttf
-ln -sf /usr/share/fonts/bitstream-vera/VeraBd.ttf VeraBd.ttf
+ln -sf /usr/share/fonts/dejavu/DejaVuSans.ttf Vera.ttf
+ln -sf /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf VeraBd.ttf
 popd
 
 %build
@@ -127,7 +145,7 @@ mapscript/java/examples/QueryByAttributeUnicode.java
    --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=`php-config --include-dir`\
    --with-fribidi-config=%{_libdir}/pkgconfig/fribidi.pc \
    --with-fastcgi=/usr \
    --without-pdf \
@@ -143,37 +161,53 @@ done
 
 # WARNING !!!
 # using %{?_smp_mflags} may break build
-
 make
+make shared
 
 # build perl
-cd mapscript/perl
+pushd mapscript/perl
+%if 0%{MS_REL}
+mv mapscript.pm mapscript%{MS_REL}.pm
+%endif
 perl Makefile.PL
-make
+make DESTDIR=%{buildroot} pure_vendor_install
+popd
 
 # build python
-cd ../python
+pushd mapscript/python
 python setup.py build
+popd
 
 # build java
-cd ../java
-make interface JAVA_HOME=/etc/alternatives/java_sdk
+pushd mapscript/java
 make JAVA_HOME=/etc/alternatives/java_sdk
+popd
 
 %install
 rm -rf %{buildroot}
 
-mkdir -p %{buildroot}/%{_sbindir}
+mkdir -p %{buildroot}%{_libexecdir}
 mkdir -p %{buildroot}/%{_sysconfdir}/php.d
 mkdir -p %{buildroot}%{_libdir}/php/modules
 mkdir -p %{buildroot}/%{_bindir}
-install -p -m 755 mapserv %{buildroot}/%{_sbindir}
-install -p -m 755 shp2img %{buildroot}/%{_bindir}
-install -p -m 755 shptree %{buildroot}/%{_bindir}
-install -p -m 755 sortshp %{buildroot}/%{_bindir}
-install -p -m 755 tile4ms %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}%{_datadir}/%{name}
+install -p -m 755 legend %{buildroot}/%{_bindir}/legend%{MS_REL}
+install -p -m 755 mapserv %{buildroot}%{_libexecdir}/mapserver%{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 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 shp2img %{buildroot}/%{_bindir}/shp2img%{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 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/
+install -p -m 755 mapscript/php/php_mapscript.so %{buildroot}/%{_libdir}/php/modules/php_mapscript%{MS_REL}.so
 
 # install perl module
 pushd mapscript/perl
@@ -187,13 +221,14 @@ popd
 
 # install java
 mkdir -p %{buildroot}%{_javadir}
-install -p -m 644 mapscript/java/mapscript.jar %{buildroot}%{_javadir}/
+install -p -m 644 mapscript/java/mapscript%{MS_REL}.jar %{buildroot}%{_javadir}/
+install -p -m 755 mapscript/java/libmapscript.so %{buildroot}%{_libdir}/
 
 # install php config file
 mkdir -p %{buildroot}%{_sysconfdir}/php.d/
 cat > %{buildroot}%{_sysconfdir}/php.d/%{name}.ini <<EOF
 ; Enable %{name} extension module
-extension=php_mapscript.so
+extension=php_mapscript%{MS_REL}.so
 EOF
 
 # cleanup junks
@@ -202,10 +237,7 @@ find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
 done
 
 # fix some exec bits
-chmod 755 %{buildroot}/%{perl_vendorarch}/auto/mapscript/mapscript.so
-
-%clean
-rm -rf %{buildroot}
+chmod 755 %{buildroot}%{perl_vendorarch}/auto/mapscript%{MS_REL}/mapscript%{MS_REL}.so
 
 %files
 %defattr(-,root,root)
@@ -213,25 +245,33 @@ rm -rf %{buildroot}
 %doc INSTALL MIGRATION_GUIDE.txt
 %doc symbols tests
 %doc fonts
-%{_bindir}/shp2img
-%{_bindir}/shptree
-%{_bindir}/sortshp
-%{_bindir}/tile4ms
-%{_sbindir}/mapserv
-
-%files -n php-mapserver
+%{_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
 %doc mapscript/php/examples
 %config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
-%{_libdir}/php/modules/php_mapscript.so
+%{_libdir}/php/modules/php_mapscript%{MS_REL}.so
 
 %files perl
 %defattr(-,root,root)
 %doc mapscript/perl/examples
-%dir %{perl_vendorarch}/auto/mapscript
-%{perl_vendorarch}/auto/mapscript/*
-%{perl_vendorarch}/mapscript.pm
+%dir %{perl_vendorarch}/auto/mapscript%{MS_REL}
+%{perl_vendorarch}/auto/mapscript%{MS_REL}/*
+%{perl_vendorarch}/mapscript%{MS_REL}.pm
 
 %files python
 %defattr(-,root,root)
@@ -246,137 +286,76 @@ rm -rf %{buildroot}
 %doc mapscript/java/examples
 %doc mapscript/java/tests
 %{_javadir}/*.jar
+%{_libdir}/libmapscript.so
 
 %changelog
-* Fri Oct 12 2012 Pavel Lisý <pali at fedoraproject.org> - 6.0.3-4
-- Update to 6.0.3, for various fixes described at:
-  https://github.com/mapserver/mapserver/blob/b8e6e0cbe0e5ff6c1a4ac682a67b108b19fc4edd/HISTORY.TXT
-- Merged from 6.0.3-3
-- fix of mapserver-java build
-
-* Sat Jun 30 2012 Devrim GÜNDÜZ <devrim at gunduz.org> - 5.6.8-1
-- Update to 5.6.8, for various fixes described at:
-  http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-8/mapserver/HISTORY.TXT
-- Update URL, per bz #835426
-
-* Mon Jul 18 2011 Devrim GÜNDÜZ <devrim at gunduz.org> - 5.6.7-1
-- Update to 5.6.7, for various fixes described at:
-  http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-7/mapserver/HISTORY.TXT
-- Fixes bz #722545
-
-* Thu Mar 18 2010 Balint Cristian <cristian.balint at gmail.com> - 5.4.2-3
-- fix bz#544679
-
-* Wed Jan 13 2010 Devrim GÜNDÜZ <devrim at gunduz.org> - 5.4.2-2
-- Rebuild against new GEOS.
-
-* Mon Aug 31 2009 Devrim GUNDUZ <devrim at 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 at redhat.com> - 5.4.1-3
-- rebuilt with new openssl
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jun 17 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.4.1-1
-- Update to 5.4.1
-
-* Sun Apr 26 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.4.0-1
-- Update to 5.4.0
-
-* Sun Apr 5 2009 Devrim GUNDUZ <devrim at 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 May 22 2013 Pavel Lisý <pali at fedoraproject.org> - 6.0.3-11
+- 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 846543 - mapserver-java is incorrectly packaged (missing required native library)
+- trim of changelog
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Mar 25 2013 Oliver Falk <oliver at linux-kernel.at> - 6.0.3-10.1
+- Rebuild - fix changelog (bogus date)
 
-* Wed Feb 11 2009 Balint Cristian <cristian.balint at gmail.com> - 5.2.1-6
-- fix vera font requirement
+* Sat Mar 23 2013 Remi Collet <rcollet at redhat.com> - 6.0.3-10
+- rebuild for http://fedoraproject.org/wiki/Features/Php55
 
-* Thu Feb 05 2009 Balint Cristian <cristian.balint at gmail.com> - 5.2.1-5
-- fix email typo
-- rebuild
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
-* Thu Jan 29 2009 Balint Cristian <cristian.balint at gmail.com> - 5.2.1-4
-- email change
-- rebuild against new gdal
+* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 6.0.3-8
+- rebuild due to "jpeg8-ABI" feature drop
 
-* Sat Jan 03 2009 Balint Cristian <rezso at rdsor.ro> 5.2.1-3
-- require external fonts
-- get rid of internal fonts
+* Fri Oct 26 2012 Remi Collet <remi at fedoraproject.org> - 6.0.3-7
+- conform to PHP Guidelines (#828161)
+- add minimal load test for php extension
 
-* Sat Dec 07 2008 Balint Cristian <rezso at rdsor.ro> 5.2.1-2
-- enable agg render engine
-- enable fribidi renderer
-- build require agg-devel fribidi-devel
+* Tue Oct 16 2012 Pavel Lisý <pali at fedoraproject.org> - 6.0.3-6
+- temporary removed mapserver-java (mapscript) due to build problem
+  with jdk7
 
-* Mon Dec 01 2008 Balint Cristian <rezso at rdsor.ro> 5.2.1-1
-- new stable upstream
+* Fri Oct 12 2012 Pavel Lisý <pali at fedoraproject.org> - 6.0.3-5
+- Merged from 6.0.3-4
+- fix of build for php4 and swig > 2.0.4
 
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 5.2.0-2
-- Rebuild for Python 2.6
+* Tue Aug 14 2012 Devrim GÜNDÜZ <devrim at gunduz.org> - 6.0.3-4
+- Rebuilt for new perl.
 
-* Wed Jul 23 2008 Balint Cristian <rezso at rdsor.ro> 5.2.0-1
-- new 5.2 series upstream
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Thu Jul 05 2008 Balint Cristian <rezso at rdsor.ro> 5.0.3-3
-- address bz#453925
+* Tue Jul 10 2012 Petr Pisar <ppisar at redhat.com> - 6.0.3-2
+- Perl 5.16 rebuild
 
-* Thu Jun 26 2008 Devrim GUNDUZ <devrim at commandprompt.com> - 5.0.3-2
-- Rebuilt against Geos 3.0.0
-
-* Thu Jun 12 2008 Balint Cristian <rezso at 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 at fedoraproject.org> - 5.0.2-2
-- Autorebuild for GCC 4.3
-
-* Sat Feb 9 2008 Devrim GUNDUZ <devrim at commandprompt.com> - 5.0.2-1
-- Update to 5.0.2
-
-* Sat Jan 5 2008 Devrim GUNDUZ <devrim at commandprompt.com> - 5.0.0-2
-- Update BR for java-devel, per Patrice Dumas
-
-* Fri Jan 4 2008 Devrim GUNDUZ <devrim at 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 at linux-kernel.at> 4.10.3-2
-- Add fix to include libmapserver (in some places), instead of
-  libmap, that doesn't exist (anymore)
+* Sat Jun 30 2012 Devrim GÜNDÜZ <devrim at gunduz.org> - 6.0.3-1
+- Update to 6.0.3, for various fixes described at:
+  https://github.com/mapserver/mapserver/blob/rel-6-0-3-0/HISTORY.TXT
+- Update URL, per bz #835426
 
-* Thu Aug 30 2007 Oliver Falk <oliver at linux-kernel.at> 4.10.3-1
-- Update to fix bz#256561, CVE-2007-4542
+* Fri Jun 08 2012 Petr Pisar <ppisar at redhat.com> - 6.0.2-2
+- Perl 5.16 rebuild
 
-* Fri May 11 2007 Balint Cristian <cbalint at redhat.com> 4.10.2-4
-- update require list properly.
+* Mon Apr 16 2012 Devrim GÜNDÜZ <devrim at gunduz.org> - 6.0.2-1
+- Update to 6.0.2, for various fixes described at:
+  http://trac.osgeo.org/mapserver/browser/tags/rel-6-0-2/mapserver/HISTORY.TXT
 
-* Thu May 10 2007 Balint Cristian <cbalint at redhat.com> 4.10.2-3
-- use macros if possible in spec
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Thu May 10 2007 Balint Cristian <cbalint at redhat.com> 4.10.2-2
-- further fixups for inclusion
+* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 6.0.1-4
+- Rebuild for new libpng
 
-* Thu May 10 2007 Balint Cristian <cbalint at redhat.com> 4.10.2-1
-- new upsream tarball (bugfix)
-- further fixups for inclusion
+* Thu Jul 21 2011 Petr Sabata <contyk at redhat.com> - 6.0.1-3
+- Perl mass rebuild
 
-* Tue Apr 24 2007 Balint Cristian <cbalint at redhat.com> 4.10.1-3
-- further fixups for inclusion
-- enable java
+* Wed Jul 20 2011 Petr Sabata <contyk at redhat.com> - 6.0.1-2
+- Perl mass rebuild
 
-* Fri Mar 16 2007 Balint Cristian <cbalint at redhat.com> 4.10.1-2
-- add docs
+* Mon Jul 18 2011 Devrim GÜNDÜZ <devrim at gunduz.org> - 6.0.1-1
+- Update to 6.0.1, for various fixes described at:
+  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 Mar 16 2007 Balint Cristian <cbalint at redhat.com> 4.10.1-1
-- first package

More information about the scm-commits mailing list