rpms/gdal/devel gdal.spec,1.43,1.44
Balint Cristian (rezso)
fedora-extras-commits at redhat.com
Wed May 28 14:10:41 UTC 2008
- Previous message (by thread): rpms/anacron/devel anacron-2.3-hourly.patch, NONE, 1.1 anacron-2.3-log.patch, NONE, 1.1 anacron.init, 1.14, 1.15 anacron.spec, 1.47, 1.48 anacron-script.patch, 1.2, NONE
- Next message (by thread): rpms/gdal/F-9 gdal.spec,1.38,1.39
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rezso
Update of /cvs/pkgs/rpms/gdal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30341/devel
Modified Files:
gdal.spec
Log Message:
- fix once more gdal-config
----------------------------------------------------------------------
Modified Files:
devel/gdal.spec
----------------------------------------------------------------------
Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gdal.spec 27 May 2008 20:48:07 -0000 1.43
+++ gdal.spec 28 May 2008 14:09:46 -0000 1.44
@@ -1,6 +1,6 @@
Name: gdal
Version: 1.5.1
-Release: 11%{?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/
@@ -373,24 +360,39 @@
#endif
#endif
EOF
-touch -r VERSION port/cpl_config.h
+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
# 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
+ARCH=\$(uname -m)
+case \$ARCH in
x86_64 | ppc64 | ia64 | s390x | sparc64 | alpha | alphaev6 )
-gdal-config-64 ${*}
+%{name}-config-64 \${*}
;;
*)
-gdal-config-32 ${*}
+%{name}-config-32 \${*}
;;
esac
EOF
-touch -r VERSION %{buildroot}%{_bindir}/%{name}-config
+chmod 755 %{buildroot}%{_bindir}/%{name}-config
+touch -r NEWS %{buildroot}%{_bindir}/%{name}-config
# cleanup junks
rm -rf %{buildroot}%{_includedir}/%{name}/%{name}
@@ -501,6 +503,9 @@
%{_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
- Previous message (by thread): rpms/anacron/devel anacron-2.3-hourly.patch, NONE, 1.1 anacron-2.3-log.patch, NONE, 1.1 anacron.init, 1.14, 1.15 anacron.spec, 1.47, 1.48 anacron-script.patch, 1.2, NONE
- Next message (by thread): rpms/gdal/F-9 gdal.spec,1.38,1.39
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list