- Various fixes from Mark Cave-Ayland
- Removed patch2: template_gis is no longer built by default. - Removed patch0: Building the JDBC driver using make is now deprecated - Build JDBC driver using ant, rather than make.
This commit is contained in:
parent
16e44360f3
commit
df472e45c9
29
postgis.spec
29
postgis.spec
@ -5,17 +5,15 @@
|
|||||||
Summary: Geographic Information Systems Extensions to PostgreSQL
|
Summary: Geographic Information Systems Extensions to PostgreSQL
|
||||||
Name: postgis
|
Name: postgis
|
||||||
Version: 1.3.2
|
Version: 1.3.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
Source0: http://postgis.refractions.net/download/%{name}-%{version}.tar.gz
|
Source0: http://postgis.refractions.net/download/%{name}-%{version}.tar.gz
|
||||||
Source4: filter-requires-perl-Pg.sh
|
Source4: filter-requires-perl-Pg.sh
|
||||||
Patch1: postgis-gnumakefile.patch
|
|
||||||
Patch2: postgis-jdbcmakefile.patch
|
|
||||||
URL: http://postgis.refractions.net/
|
URL: http://postgis.refractions.net/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: postgresql-devel, proj-devel, geos-devel, byacc, proj-devel, flex, sinjdoc, eclipse-ecj, libgcj
|
BuildRequires: postgresql-devel, proj-devel, geos-devel, byacc, proj-devel, flex, sinjdoc, java, java-devel, ant
|
||||||
|
|
||||||
Requires: postgresql, geos, proj
|
Requires: postgresql, geos, proj
|
||||||
|
|
||||||
@ -37,8 +35,8 @@ BuildRequires: ant >= 0:1.6.2, junit >= 0:3.7, postgresql-jdbc
|
|||||||
|
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
BuildRequires: gcc-java
|
BuildRequires: gcc-java
|
||||||
Requires(post): java-1.4.2-gcj-compat
|
Requires(post): %{_bindir}/rebuild-gcj-db
|
||||||
Requires(postun): java-1.4.2-gcj-compat
|
Requires(postun): %{_bindir}/rebuild-gcj-db
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description jdbc
|
%description jdbc
|
||||||
@ -59,20 +57,19 @@ The postgis-utils package provides the utilities for PostGIS.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p0
|
|
||||||
# To be removed in 1.2.2
|
|
||||||
%patch2 -p0
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
make %{?_smp_mflags} LPATH=`pg_config --pkglibdir` shlib="%{name}.so"
|
make %{?_smp_mflags} LPATH=`pg_config --pkglibdir` shlib="%{name}.so"
|
||||||
|
|
||||||
%if %javabuild
|
%if %javabuild
|
||||||
export MAKEFILE_DIR=%{_builddir}/%{name}-%{version}/java/jdbc
|
export BUILDXML_DIR=%{_builddir}/%{name}-%{version}/java/jdbc
|
||||||
JDBC_VERSION_RPM=`rpm -ql postgresql-jdbc| grep 'jdbc2.jar$'|awk -F '/' '{print $5}'`
|
JDBC_VERSION_RPM=`rpm -ql postgresql-jdbc| grep 'jdbc2.jar$'|awk -F '/' '{print $5}'`
|
||||||
sed 's/postgresql.jar/'${JDBC_VERSION_RPM}'/g' $MAKEFILE_DIR/Makefile > $MAKEFILE_DIR/Makefile.new
|
sed 's/postgresql.jar/'${JDBC_VERSION_RPM}'/g' $BUILDXML_DIR/build.xml > $BUILDXML_DIR/build.xml.new
|
||||||
mv -f $MAKEFILE_DIR/Makefile.new $MAKEFILE_DIR/Makefile
|
mv -f $BUILDXML_DIR/build.xml.new $BUILDXML_DIR/build.xml
|
||||||
make -C java/jdbc
|
pushd java/jdbc
|
||||||
|
ant
|
||||||
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %utils
|
%if %utils
|
||||||
@ -147,6 +144,12 @@ rm -rf %{buildroot}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 5 2008 Devrim GUNDUZ <devrim@commandprompt.com> - 1.3.2-2
|
||||||
|
- Various fixes from Mark Cave-Ayland
|
||||||
|
- Removed patch2: template_gis is no longer built by default.
|
||||||
|
- Removed patch0: Building the JDBC driver using make is now deprecated
|
||||||
|
- Build JDBC driver using ant, rather than make.
|
||||||
|
|
||||||
* Thu Dec 6 2007 Devrim GUNDUZ <devrim@commandprompt.com> - 1.3.2-1
|
* Thu Dec 6 2007 Devrim GUNDUZ <devrim@commandprompt.com> - 1.3.2-1
|
||||||
- Update to 1.3.2
|
- Update to 1.3.2
|
||||||
- Updated patch2
|
- Updated patch2
|
||||||
|
Loading…
Reference in New Issue
Block a user