rpms/gdal/F-9 gdal.spec,1.38,1.39
Balint Cristian (rezso)
fedora-extras-commits at redhat.com
Wed May 28 14:13:04 UTC 2008
Author: rezso
Update of /cvs/pkgs/rpms/gdal/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30512/F-9
Modified Files:
gdal.spec
Log Message:
- fix once more gdal-config
----------------------------------------------------------------------
Modified Files:
F-9/gdal.spec
----------------------------------------------------------------------
Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/F-9/gdal.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gdal.spec 27 May 2008 13:20:50 -0000 1.38
+++ gdal.spec 28 May 2008 14:12:15 -0000 1.39
@@ -1,6 +1,6 @@
Name: gdal
Version: 1.5.1
-Release: 10%{?dist}
+Release: 12%{?dist}
Summary: GIS file format library
Group: System Environment/Libraries
License: MIT
@@ -183,7 +183,7 @@
--datadir=%{_datadir}/%{name}/ \
--with-threads \
--with-dods-root=%{_libdir} \
- --with-ogdi=`ogdi-config-%{cpuarch} --libdir` \
+ --with-ogdi=`ogdi-config --libdir` \
--with-cfitsio=%{_prefix} \
--with-geotiff=external \
--with-tiff=external \
@@ -302,24 +302,11 @@
rm -rf %{buildroot}%{ruby_sitearch}/%{name}
# install multilib java modules in the right path
-touch -r VERSION swig/java/gdal.jar
+touch -r NEWS swig/java/gdal.jar
mkdir -p %{buildroot}%{_javadir}
cp -p swig/java/gdal.jar \
%{buildroot}%{_javadir}/%{name}-%{version}.jar
-# install pkgconfig file
-cat > %{name}.pc <<EOF
-prefix=%{_prefix}
-exec_prefix=%{_prefix}
-libdir=%{_libdir}
-includedir=%{_includedir}
-
-Name: GDAL
-Description: GIS file format library
-Version: %{version}
-Libs: -L\${libdir} -lgdal
-Cflags: -I\${includedir}/%{name}
-EOF
mkdir -p %{buildroot}%{_libdir}/pkgconfig/
install -p -m 644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig/
@@ -361,20 +348,51 @@
install -p -m 644 port/cpl_config.h %{buildroot}%{_includedir}/%{name}/cpl_config-%{cpuarch}.h
# create universal multilib cpl_config.h bz#341231
cat > %{buildroot}%{_includedir}/%{name}/cpl_config.h <<EOF
-include <bits/wordsize.h>
+#include <bits/wordsize.h>
-if __WORDSIZE == 32
-include "gdal/cpl_config-32.h"
-elif __WORDSIZE == 64
-include "gdal/cpl_config-64.h"
-else
-error "Unknown word size"
-endif
+#if __WORDSIZE == 32
+#include "gdal/cpl_config-32.h"
+#else
+#if __WORDSIZE == 64
+#include "gdal/cpl_config-64.h"
+#else
+#error "Unknown word size"
+#endif
+#endif
+EOF
+touch -r NEWS port/cpl_config.h
+
+# install pkgconfig file
+cat > %{name}.pc <<EOF
+prefix=%{_prefix}
+exec_prefix=%{_prefix}
+libdir=%{_libdir}
+includedir=%{_includedir}
+
+Name: GDAL
+Description: GIS file format library
+Version: %{version}
+Libs: -L\${libdir} -lgdal
+Cflags: -I\${includedir}/%{name}
EOF
-touch -r VERSION port/cpl_config.h
# multilib gdal-config
mv %{buildroot}%{_bindir}/%{name}-config %{buildroot}%{_bindir}/%{name}-config-%{cpuarch}
+cat > %{buildroot}%{_bindir}/%{name}-config <<EOF
+#!/bin/bash
+
+ARCH=\$(uname -m)
+case \$ARCH in
+x86_64 | ppc64 | ia64 | s390x | sparc64 | alpha | alphaev6 )
+%{name}-config-64 \${*}
+;;
+*)
+%{name}-config-32 \${*}
+;;
+esac
+EOF
+chmod 755 %{buildroot}%{_bindir}/%{name}-config
+touch -r NEWS %{buildroot}%{_bindir}/%{name}-config
# cleanup junks
rm -rf %{buildroot}%{_includedir}/%{name}/%{name}
@@ -448,6 +466,7 @@
%files devel
%defattr(-,root,root,-)
%doc docs
+%{_bindir}/%{name}-config
%{_bindir}/%{name}-config-%{cpuarch}
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*.h
@@ -484,6 +503,13 @@
%{_javadir}/%{name}-%{version}.jar
%changelog
+* Wed May 27 2008 Balint Cristian <rezso at rdsor.ro> - 1.5.1-12
+- fix once more gdal-config
+
+* Tue May 27 2008 Balint Cristian <rezso at rdsor.ro> - 1.5.1-11
+- fix multilib gdal-config, add wrapper around
+- fix typos in cpl_config.h wrapper
+
* Tue May 27 2008 Balint Cristian <rezso at rdsor.ro> - 1.5.1-10
- fix for multilib packaging bz#341231
- huge spec cleanup
More information about the fedora-extras-commits
mailing list