- Rebuilt for proj 4.9.3
- Fix many rpmlint warnings/errors.
This commit is contained in:
Devrim Gündüz
parent
23f30fda35
commit
2a554de154
26
gdal.spec
26
gdal.spec
|
|
@ -6,7 +6,7 @@
|
|||
#TODO: e00compr bundled?
|
||||
#TODO: There are tests for bindings -- at least for Perl
|
||||
#TODO: Java has a directory with test data and a build target called test
|
||||
# It uses %{JAVA_RUN}; make test seems to work in the build directory
|
||||
# It uses %%{JAVA_RUN}; make test seems to work in the build directory
|
||||
#TODO: e00compr source is the same in the package and bundled in GDAL
|
||||
#TODO: Consider doxy patch from Suse, setting EXTRACT_LOCAL_CLASSES = NO
|
||||
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
# He also suggest to use --with-static-proj4 to actually link to proj, instead of dlopen()ing it.
|
||||
|
||||
# Major digit of the proj so version
|
||||
%global proj_somaj 9
|
||||
%global proj_somaj 12
|
||||
|
||||
# Tests can be of a different version
|
||||
%global testversion 2.1.1
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
Name: gdal
|
||||
Version: 2.1.2
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Summary: GIS file format library
|
||||
Group: System Environment/Libraries
|
||||
License: MIT
|
||||
|
|
@ -374,12 +374,6 @@ sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
|
|||
# https://bugzilla.redhat.com/show_bug.cgi?id=1284714
|
||||
sed -i 's|CFLAGS=\"${GEOS_CFLAGS}\"|CFLAGS=\"${CFLAGS} ${GEOS_CFLAGS}\"|g' configure
|
||||
|
||||
# Activate support for JPEGLS
|
||||
#sed -i 's|^#HAVE_CHARLS|HAVE_CHARLS|' GDALmake.opt.in
|
||||
#sed -i 's|#CHARLS_INC = -I/path/to/charls_include|CHARLS_INC = -I%{_includedir}/CharLS|' GDALmake.opt.in
|
||||
#sed -i 's|#CHARLS_LIB = -L/path/to/charls_lib -lCharLS|CHARLS_LIB = -lCharLS|' GDALmake.opt.in
|
||||
|
||||
|
||||
%build
|
||||
#TODO: Couldn't I have modified that in the prep section?
|
||||
%ifarch sparcv9 sparc64 s390 s390x
|
||||
|
|
@ -442,8 +436,6 @@ export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff"
|
|||
--with-python \
|
||||
--with-libkml
|
||||
|
||||
#--with-rasdaman # 8.3 rasdaman has no -lcompression; doesn't work
|
||||
|
||||
# {?_smp_mflags} doesn't work; Or it does -- who knows!
|
||||
make %{?_smp_mflags}
|
||||
make man
|
||||
|
|
@ -546,9 +538,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
|
|||
find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \;
|
||||
find %{buildroot}%{perl_vendorarch} -name "*.pm" -exec chmod 644 '{}' \;
|
||||
|
||||
#TODO: JAR files that require JNI shared objects MUST be installed in %{_libdir}/%{name}. The JNI shared objects themselves must also be installed in %{_libdir}/%{name}.
|
||||
#TODO: JAR files that require JNI shared objects MUST be installed in %%{_libdir}/%%{name}. The JNI shared objects themselves must also be installed in %%{_libdir}/%%{name}.
|
||||
#Java programs that wish to make calls into native libraries do so via the Java Native Interface (JNI). A Java package uses JNI if it contains a .so
|
||||
#If the JNI-using code calls System.loadLibrary you'll have to patch it to use System.load, passing it the full path to the dynamic shared object. If the package installs a wrapper script you'll need to manually add %{_libdir}/%{name}/<jar filename> to CLASSPATH. If you are depending on a JNI-using JAR file, you'll need to add it manually -- build-classpath will not find it.
|
||||
#If the JNI-using code calls System.loadLibrary you'll have to patch it to use System.load, passing it the full path to the dynamic shared object. If the package installs a wrapper script you'll need to manually add %%{_libdir}/%%{name}/<jar filename> to CLASSPATH. If you are depending on a JNI-using JAR file, you'll need to add it manually -- build-classpath will not find it.
|
||||
touch -r NEWS swig/java/gdal.jar
|
||||
mkdir -p %{buildroot}%{_javadir}
|
||||
cp -p swig/java/gdal.jar \
|
||||
|
|
@ -705,7 +697,7 @@ pushd %{name}autotest-%{testversion}
|
|||
export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python_sitearch}
|
||||
#TODO: Nötig?
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir}
|
||||
# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir}:$java_inc
|
||||
# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%%{buildroot}%%{_libdir}:$java_inc
|
||||
|
||||
export GDAL_DATA=%{buildroot}%{_datadir}/%{name}/
|
||||
|
||||
|
|
@ -722,7 +714,7 @@ pushd %{name}autotest-%{testversion}
|
|||
# Run tests but force normal exit in the end
|
||||
./run_all.py || true
|
||||
popd
|
||||
%endif #%{run_tests}
|
||||
%endif #%%{run_tests}
|
||||
|
||||
|
||||
%post libs -p /sbin/ldconfig
|
||||
|
|
@ -836,6 +828,10 @@ popd
|
|||
#Or as before, using ldconfig
|
||||
|
||||
%changelog
|
||||
* Tue Jan 24 2017 Devrim Gündüz <devrim@gunduz.org> - 2.1.2-6
|
||||
- Rebuilt for proj 4.9.3
|
||||
- Fix many rpmlint warnings/errors.
|
||||
|
||||
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.1.2-5
|
||||
- Rebuild for Python 3.6
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue