Fix build problems with Latex and correct some glitches

This commit is contained in:
Volker Fröhlich 2011-03-21 01:23:05 +01:00
parent 52687d5206
commit bb2ca0c4ef
1 changed files with 33 additions and 19 deletions

View File

@ -1,6 +1,6 @@
Name: gdal
Version: 1.7.3
Release: 3.1%{?dist}
Release: 4%{?dist}
Summary: GIS file format library
Group: System Environment/Libraries
License: MIT
@ -52,6 +52,12 @@ BuildRequires: ant swig ruby java-devel-gcj
%{!?python_lib: %define python_lib %(%{__python} -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)')}
%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
# We don't want to provide private python extension libs
%{?filter_setup:
%filter_provides_in %{python_lib}/.*\.so %{_libdir}/perl5/.*\.so$
%filter_setup
}
%if %{grass_support}
BuildRequires: grass-devel
%endif
@ -139,12 +145,6 @@ This package contains html and pdf documentation for GDAL.
# unpack test cases also.
tar -xzf %{SOURCE1}
# fix russian docs from tarball
for ru in `find doc/ru/ -type f -name "*.dox"`; do
iconv -f KOI8-R -t UTF-8 < $ru > $ru.tmp
mv -f $ru.tmp $ru
done
set +x
for f in `find . -type f` ; do
if file $f | grep -q ISO-8859 ; then
@ -380,20 +380,24 @@ install -p -m 644 doc/latex/refman.pdf docs/docs-%{cpuarch}/pdf/en
install -p -m 644 doc/br/latex/refman.pdf docs/docs-%{cpuarch}/pdf/br/
install -p -m 644 latex/refman.pdf docs/docs-%{cpuarch}/
install -p -m 644 latex/class*.pdf docs/docs-%{cpuarch}/
install -p -m 644 doc/ru/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ru/
install -p -m 644 ogr/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogr/
install -p -m 644 ogr/latex/class*.pdf docs/docs-%{cpuarch}/pdf/ogr/
install -p -m 644 ogr/ogrsf_frmts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/
%ifnarch ppc ppc64
install -p -m 644 ogr/ogrsf_frmts/dgn/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/dgn/
%endif
# Doesn't work at all. Complaints about different nesting level in \pdfendlink
#%ifnarch ppc ppc64
#install -p -m 644 ogr/ogrsf_frmts/dgn/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/dgn/
#%endif
%if "%{?dist}" != ".el4"
# broken on el4
install -p -m 644 frmts/gxf/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/gxf/
install -p -m 644 frmts/sdts/latex/class*.pdf docs/docs-%{cpuarch}/pdf/frmts/gxf/
%endif
%ifnarch ppc ppc64
install -p -m 644 frmts/sdts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/sdts/
%endif
# Doesn't work at all. Complaints about different nesting level in \pdfendlink
# Working in GDAL 1.8.0, funny enough!
#%ifnarch ppc ppc64
#install -p -m 644 frmts/sdts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/sdts/
#%endif
install -p -m 644 frmts/iso8211/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/iso8211/
mkdir -p doc/docs-perl/docs-%{cpuarch}/pdf
install -p -m 644 swig/perl/latex/refman.pdf doc/docs-perl/docs-%{cpuarch}/pdf
@ -409,6 +413,10 @@ cp -pr doc/br/html/* docs/docs-%{cpuarch}/br
cp -pr doc/ru/html/* docs/docs-%{cpuarch}/ru
cp -pr swig/perl/html/* doc/docs-perl/docs-%{cpuarch}/
# Remove installation shell script
rm -rf docs/docs-%{cpuarch}/ru/installdox
rm -rf docs/docs-%{cpuarch}/en/html/installdox
# install multilib cpl_config.h bz#430894
install -p -D -m 644 port/cpl_config.h %{buildroot}%{_includedir}/%{name}/cpl_config-%{cpuarch}.h
# create universal multilib cpl_config.h bz#341231
@ -500,20 +508,18 @@ popd
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
%post -p /sbin/ldconfig
%postun
/sbin/ldconfig
%postun -p /sbin/ldconfig
# update maven2 depmap
%post java
/sbin/ldconfig
# update maven2 depmap
%update_maven_depmap
# update maven2 depmap
%postun java
/sbin/ldconfig
# update maven2 depmap
%update_maven_depmap
%files
@ -592,6 +598,14 @@ rm -rf $RPM_BUILD_ROOT
%doc docs
%changelog
* Sun Mar 20 2011 Volker Fröhlich <volker27@gmx.at> 1.7.3-4
- Dropped unnecessary encoding conversion for Russian refman
- Install Russian refman
- Don't try to install refman for sdts and dgn, as they fail to compile
- Added -p to post and postun
- Remove private-shared-object-provides for Python and Perl
- Remove installdox scripts
* Wed Mar 16 2011 Karsten Hopp <karsten@redhat.com> 1.7.3-3.1
- current gcc doesn't accept -Xcompiler
- some pdf's don't build on ppc, ignore them atm.