rpms/gdal/devel gdal.spec,1.42,1.43
Balint Cristian (rezso)
fedora-extras-commits at redhat.com
Tue May 27 20:49:03 UTC 2008
- Previous message (by thread): rpms/daa2iso/devel daa2iso.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/perl-Event-Lib/F-9 perl-Event-Lib.spec, NONE, 1.1 sources, 1.1, 1.2
- 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-serv326/devel
Modified Files:
gdal.spec
Log Message:
- fix multilib gdal-config, add wrapper around
- fix typos in cpl_config.h wrapper
----------------------------------------------------------------------
Modified Files:
devel/gdal.spec
----------------------------------------------------------------------
Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gdal.spec 27 May 2008 10:50:46 -0000 1.42
+++ gdal.spec 27 May 2008 20:48:07 -0000 1.43
@@ -1,6 +1,6 @@
Name: gdal
Version: 1.5.1
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: GIS file format library
Group: System Environment/Libraries
License: MIT
@@ -361,20 +361,36 @@
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 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 )
+gdal-config-64 ${*}
+;;
+*)
+gdal-config-32 ${*}
+;;
+esac
+EOF
+touch -r VERSION %{buildroot}%{_bindir}/%{name}-config
# cleanup junks
rm -rf %{buildroot}%{_includedir}/%{name}/%{name}
@@ -448,6 +464,7 @@
%files devel
%defattr(-,root,root,-)
%doc docs
+%{_bindir}/%{name}-config
%{_bindir}/%{name}-config-%{cpuarch}
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*.h
@@ -484,12 +501,21 @@
%{_javadir}/%{name}-%{version}.jar
%changelog
+* 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
- enable russian and brazil docs
- enable and triage more docs
+* Sun May 25 2008 Balint Cristian <rezso at rdsor.ro> - 1.5.1-9
+- enable ruby and java packages
+- fix spurious sed problem
+- spec file cosmetics
+
* Thu May 23 2008 Balint Cristian <rezso at rdsor.ro> - 1.5.1-8
- fix sincos on all arch
- Previous message (by thread): rpms/daa2iso/devel daa2iso.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/perl-Event-Lib/F-9 perl-Event-Lib.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list