[svn] r6108 - in trunk/rpms: klavaro postgis

[packagers at lists.rpmforge.net]

Author: dries
Date: 2008-01-23 17:35:32 +0100 (Wed, 23 Jan 2008)
New Revision: 6108

Modified:
   trunk/rpms/klavaro/klavaro.spec
   trunk/rpms/postgis/postgis.spec
Log:
updates

Modified: trunk/rpms/klavaro/klavaro.spec
===================================================================
--- trunk/rpms/klavaro/klavaro.spec	2008-01-23 14:48:07 UTC (rev 6107)
+++ trunk/rpms/klavaro/klavaro.spec	2008-01-23 16:35:32 UTC (rev 6108)
@@ -6,7 +6,7 @@
 
 Summary: Typing tutor
 Name: klavaro
-Version: 1.0.6
+Version: 1.0.7
 Release: 1
 License: GPL
 Group: Applications/Multimedia
@@ -73,6 +73,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Wed Jan 23 2008 Dries Verachtert <dries at ulyssis.org> - 1.0.7-1
+- Updated to release 1.0.7.
+
 * Sun Jan  6 2008 Dries Verachtert <dries at ulyssis.org> - 1.0.6-1
 - Updated to release 1.0.6.
 

Modified: trunk/rpms/postgis/postgis.spec
===================================================================
--- trunk/rpms/postgis/postgis.spec	2008-01-23 14:48:07 UTC (rev 6107)
+++ trunk/rpms/postgis/postgis.spec	2008-01-23 16:35:32 UTC (rev 6108)
@@ -3,14 +3,13 @@
 
 Summary: Geographic Information Systems Extensions to PostgreSQL
 Name: postgis
-Version: 1.2.1
+Version: 1.3.2
 Release: 1
 License: GPL
 Group: Applications/Databases
 URL: http://postgis.refractions.net/
 
 Source: http://postgis.refractions.net/download/postgis-%{version}.tar.gz
-Patch0: postgis-1.2.1-template_gis_make.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Buildrequires: bison
@@ -43,7 +42,7 @@
 
 %prep
 %setup
-%patch0 -p1 -b .buildfix
+%{__perl} -pi.orig -e "s|^SCRIPT_DOLINK=rm.*|SCRIPT_DOLINK=echo \\\\|g;" extras/template_gis/Makefile
 
 %build
 %{__make} %{?_smp_mflags} \
@@ -52,7 +51,7 @@
     shlib="postgis.so"
 #    LPATH="\$\(pkglibdir\)" \
 #    CFLAGS="%{optflags} -Wno-pointer-sign"
-
+%{__make} %{?_smp_mflags} templategis
 %{__make} -C utils
 
 %install
@@ -61,6 +60,8 @@
     PGXS="1" \
     PGSQL_SRC="/usr/lib/pgsql/pgxs"
 
+%{__make} templategis-install DESTDIR="%{buildroot}"
+
 %{__install} -Dp -m0755 lwgeom/liblwgeom.so %{buildroot}%{_libdir}/pgsql/liblwgeom.so
 %{__install} -Dp -m0755 lwgeom/postgis.so %{buildroot}%{_libdir}/pgsql/postgis.so
 
@@ -82,7 +83,7 @@
 %doc %{_mandir}/man1/createdb.postgis.1*
 %doc %{_mandir}/man1/mktemplate_gis.1*
 %doc %{_mandir}/man1/rmtemplate_gis.1*
-%config(noreplace) %{_sysconfdir}/default/postgis
+%config(noreplace) %{_datadir}/default/postgis
 %{_bindir}/createdb.postgis
 %{_bindir}/mktemplate_gis
 %{_bindir}/mktemplate_gis.sh
@@ -107,5 +108,8 @@
 %{_datadir}/postgis/
 
 %changelog
+* Tue Jan 22 2008 Dries Verachtert <dries at ulyssis.org> - 1.3.2-1
+- Updated to release 1.3.2.
+
 * Sun Aug 19 2007 Dag Wieers <dag at wieers.com> - 1.2.1-1
 - Initial package. (using DAR)