packages: postgis/postgis.spec - simplified installation process (builds no...

[wrobell]

Author: wrobell                      Date: Mon Apr  2 19:51:54 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- simplified installation process (builds now)
- ver. 2.0.0rc2

---- Files affected:
packages/postgis:
   postgis.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: packages/postgis/postgis.spec
diff -u packages/postgis/postgis.spec:1.59 packages/postgis/postgis.spec:1.60
--- packages/postgis/postgis.spec:1.59	Fri Mar 30 21:26:12 2012
+++ packages/postgis/postgis.spec	Mon Apr  2 21:51:48 2012
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 %define pg_version	%(rpm -q --queryformat '%{VERSION}' postgresql-backend-devel)
-%define	beta rc1
+%define	beta rc2
 
 # Conditional build:
 %bcond_without  raster # disable raster support
@@ -9,11 +9,11 @@
 Summary(pl.UTF-8):	Rozszerzenie do PostgreSQL wspomagające Geograficzne Systemy Informacyjne
 Name:		postgis
 Version:	2.0.0
-Release:	0.1
+Release:	0.%{beta}.1
 License:	GPL v2
 Group:		Applications/Databases
 Source0:	http://postgis.refractions.net/download/%{name}-%{version}%{beta}.tar.gz
-# Source0-md5:	13f67b8caa25676c2d0ff617b3a63031
+# Source0-md5:	2337db7420746aeaeb631c950bbaeb82
 URL:		http://postgis.refractions.net/
 %{?with_raster:BuildRequires:	gdal-devel >= 1.6.0}
 BuildRequires:	geos-devel >= 3.2.0
@@ -50,23 +50,17 @@
 	--with-proj-libdir=/usr/%{_lib} \
 	%{!?with_raster:--without-raster}
 
-%{__make} \
-	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	CFLAGS="%{rpmcppflags} %{rpmcflags}" \
-	LPATH="%{_libdir}/postgresql"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/postgresql,%{_bindir},%{_datadir}/postgresql/contrib}
 
-%{__make} -C loader install \
-	bindir="$RPM_BUILD_ROOT%{_bindir}" \
-    PGSQL_BINDIR="$RPM_BUILD_ROOT%{_bindir}" \
-	INSTALL_PROGRAM=install
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-install postgis/*.so* $RPM_BUILD_ROOT%{_libdir}/postgresql
-install postgis/*.sql *.sql $RPM_BUILD_ROOT%{_datadir}/postgresql/contrib
+# put into lib subpackage if we are interested in the files below?
+rm $RPM_BUILD_ROOT%{_includedir}/liblwgeom.h \
+	$RPM_BUILD_ROOT%{_libdir}/liblwgeom.a \
+	$RPM_BUILD_ROOT%{_libdir}/liblwgeom.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,7 +70,8 @@
 %doc CREDITS NEWS README.postgis TODO doc/html
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/postgresql/*.so*
-%{_datadir}/postgresql/contrib/*.sql
+%{_libdir}/lib*.so
+%{_datadir}/postgresql/contrib/postgis-2.0
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -84,6 +79,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2012/04/02 19:51:48  wrobell
+- simplified installation process (builds now)
+- ver. 2.0.0rc2
+
 Revision 1.59  2012/03/30 19:26:12  wrobell
 - started to work on postgis 2.0.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/postgis/postgis.spec?r1=1.59&r2=1.60