rpms/postgis/EL-6 .cvsignore, 1.15, 1.16 postgis.spec, 1.33, 1.34 sources, 1.15, 1.16

Thu Jul 1 16:22:58 UTC 2010

Author: devrim

Update of /cvs/extras/rpms/postgis/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11229

Modified Files:
	.cvsignore postgis.spec sources 
Log Message:
Submit PostGIS 1.5.1 to EL-6. This is a better start for the new OS.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgis/EL-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16

--- .cvsignore	11 Mar 2010 19:06:58 -0000	1.15
+++ .cvsignore	1 Jul 2010 16:22:58 -0000	1.16
@@ -1,4 +1,2 @@
-postgis-1.4.1.pdf
-postgis-1.4.1.tar.gz
-postgis-1.4.2.tar.gz
-postgis-1.4.2.pdf
+postgis-1.5.1.tar.gz
+postgis-1.5.1.pdf


Index: postgis.spec
===================================================================
RCS file: /cvs/extras/rpms/postgis/EL-6/postgis.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- postgis.spec	11 Mar 2010 19:06:59 -0000	1.33
+++ postgis.spec	1 Jul 2010 16:22:58 -0000	1.34
@@ -2,9 +2,11 @@
 %{!?utils:%define	utils 1}
 %{!?gcj_support:%define	gcj_support 1}
 
+%global majorversion 1.5
+
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
-Version:	1.4.2
+Version:	1.5.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Databases
@@ -15,7 +17,7 @@ URL:		http://postgis.refractions.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	postgresql-devel >= 8.2, proj-devel, geos-devel >= 3.1.1, byacc, proj-devel, flex, sinjdoc, java, java-devel, ant
-BuildRequires:	gtk2-devel
+BuildRequires:	gtk2-devel, libxml2-devel
 Requires:	postgresql >= 8.2, geos >= 3.1.1, proj
 
 %description
@@ -38,7 +40,7 @@ Summary:	The JDBC driver for PostGIS
 Group:		Applications/Databases
 License:	LGPLv2+
 Requires:	%{name} = %{version}-%{release}, postgresql-jdbc
-BuildRequires:  ant >= 0:1.6.2, junit >= 0:3.7, postgresql-jdbc
+BuildRequires:	ant >= 0:1.6.2, junit >= 0:3.7, postgresql-jdbc
 
 %if %{gcj_support}
 BuildRequires:		gcc-java
@@ -64,7 +66,7 @@ The postgis-utils package provides the u
 %define __perl_requires %{SOURCE4}
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 # Copy .pdf file to top directory before installing.
 cp -p %{SOURCE2} .
 
@@ -93,14 +95,13 @@ make install DESTDIR=%{buildroot}
 install -d %{buildroot}%{_libdir}/pgsql/
 install -d  %{buildroot}%{_datadir}/pgsql/contrib/
 install -m 644 *.sql %{buildroot}%{_datadir}/pgsql/contrib/
-install -m 755 loader/shp2pgsql-cli loader/shp2pgsql-gui %{buildroot}%{_bindir}/
+install -m 755 loader/shp2pgsql loader/shp2pgsql-gui %{buildroot}%{_bindir}/
 rm -f  %{buildroot}%{_datadir}/*.sql
 
 if [ "%{_libdir}" = "/usr/lib64" ] ; then
-	mv %{buildroot}%{_datadir}/pgsql/contrib/postgis.sql %{buildroot}%{_datadir}/pgsql/contrib/postgis-64.sql
-	mv %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade_12_to_14.sql %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade_12_to_14-64.sql
-	mv %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade_13_to_14.sql %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade_13_to_14-64.sql
-	mv %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade_14_minor.sql %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade_14_minor-64.sql	
+	mv %{buildroot}%{_datadir}/pgsql/contrib/%{name}-%{majorversion}/postgis.sql %{buildroot}%{_datadir}/pgsql/contrib/postgis-64.sql
+	mv %{buildroot}%{_datadir}/pgsql/contrib/%{name}-%{majorversion}/postgis_upgrade_13_to_15.sql %{buildroot}%{_datadir}/pgsql/contrib/%{name}-%{majorversion}/postgis_upgrade_13_to_15-64.sql
+	mv %{buildroot}%{_datadir}/pgsql/contrib/%{name}-%{majorversion}/postgis_upgrade_14_to_15.sql %{buildroot}%{_datadir}/pgsql/contrib/%{name}-%{majorversion}/postgis_upgrade_14_to_15-64.sql
 fi
 
 %if %javabuild
@@ -114,7 +115,7 @@ strip %{buildroot}/%{_libdir}/gcj/%{name
 
 %if %utils
 install -d %{buildroot}%{_datadir}/%{name}
-install -m 644 utils/*.pl %{buildroot}%{_datadir}/%{name}
+install -m 755 utils/*.pl %{buildroot}%{_datadir}/%{name}
 %endif
 
 %clean
@@ -133,6 +134,7 @@ rm -rf %{buildroot}
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/pgsql/postgis-*.so
 %{_datadir}/pgsql/contrib/*.sql
+%{_datadir}/pgsql/contrib/%{name}-%{majorversion}/*.sql
 
 %if %javabuild
 %files jdbc
@@ -148,16 +150,19 @@ rm -rf %{buildroot}
 
 %if %utils
 %files utils
-%defattr(-,root,root)
+%defattr(755,root,root)
 %doc utils/README
 %dir %{_datadir}/%{name}/
-%attr(755,root,root) %{_datadir}/%{name}/test_estimation.pl
-%attr(755,root,root) %{_datadir}/%{name}/profile_intersects.pl
-%attr(755,root,root) %{_datadir}/%{name}/test_joinestimation.pl
-%attr(644,root,root) %{_datadir}/%{name}/create_undef.pl
-%attr(644,root,root) %{_datadir}/%{name}/%{name}_proc_upgrade.pl
-%attr(644,root,root) %{_datadir}/%{name}/%{name}_restore.pl
-%attr(644,root,root) %{_datadir}/%{name}/new_postgis_restore.pl
+%{_datadir}/%{name}/test_estimation.pl
+%{_datadir}/%{name}/profile_intersects.pl
+%{_datadir}/%{name}/test_joinestimation.pl
+%{_datadir}/%{name}/create_undef.pl
+%{_datadir}/%{name}/%{name}_proc_upgrade.pl
+%{_datadir}/%{name}/%{name}_restore.pl
+%{_datadir}/%{name}/new_postgis_restore.pl
+%{_datadir}/%{name}/read_scripts_version.pl
+%{_datadir}/%{name}/test_geography_estimation.pl
+%{_datadir}/%{name}/test_geography_joinestimation.pl
 %endif
 
 %files docs
@@ -165,144 +170,5 @@ rm -rf %{buildroot}
 %doc postgis*.pdf
 
 %changelog
-* Thu Mar 11 2010 Devrim GÜNDÜZ <devrim at gunduz.org> - 1.4.2-1
-- Update to 1.4.2
-
-* Wed Jan 13 2010 Devrim GÜNDÜZ <devrim at gunduz.org> - 1.4.1-3
-- Rebuild against new GEOS.
-
-* Wed Jan 6 2010 Devrim GÜNDÜZ <devrim at gunduz.org> - 1.4.1-2
-- Add shp2pgsql-{cli-gui} among installed files.
-
-* Sun Dec 20 2009 Devrim GÜNDÜZ <devrim at gunduz.org> - 1.4.1-1
-- Update to 1.4.1
-
-* Sun Nov 22 2009 Devrim GÜNDÜZ <devrim at gunduz.org> - 1.4.0-3
-- Fix spec, per bz #536860
-
-* Wed Nov 11 2009 Devrim GÜNDÜZ <devrim at gunduz.org> - 1.4.0-2
-- Rebuilt for PostgreSQL 8.4, per bz #536860
-
-* Mon Jul 27 2009 Devrim GUNDUZ <devrim at gunduz.org> - 1.4.0-1
-- Update to 1.4.0
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0rc1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Jul 6 2009 Devrim GUNDUZ <devrim at gunduz.org> - 1.4.0rc1-1
-- Update to 1.4.0rc1
-- Fix spec for 1.4
-
-* Thu Jun 18 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.6-2
-- Add a new subpackage: -docs, and add postgis pdf file to it.
-- Own /usr/share/postgis, per bugzilla #474686
-
-* Fri May 8 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.6-1
-- Update to 1.3.6
-
-* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.3.5-3
-- Fix FTBFS: added BR: java-1.5.0-gcj-devel in case of gcj_support
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Dec 16 2008 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.5-1
-- Update to 1.3.5
-
-* Sat Nov 29 2008 Devrim GUNDUZ <devrim at gunduz.org> - 1.3.4-1
-- Update to 1.3.4
-
-* Mon Aug 11 2008 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.3-4
-- Fix #451387. Patch from Toshio.
-
-* Thu Jun 26 2008 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.3-3
-- Rebuilt against geos 3.0.0
-
-* Thu May 29 2008 Todd Zullinger <tmz at pobox.com> - 1.3.3-2
-- fix license tags
-
-* Sun Apr 13 2008 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.3-1
-- Update to 1.3.3
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.2-3.1
-- Autorebuild for GCC 4.3
-
-* Mon Jan 21 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 1.3.2-2.1
-- Rebuilt against PostgreSQL 8.3
-
-* Sat Jan 5 2008 Devrim GUNDUZ <devrim at 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 at commandprompt.com> - 1.3.2-1
-- Update to 1.3.2
-- Updated patch2
-
-* Wed Nov 21 2007 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.1-2
-- Move postgresql-jdbc dependency to the correct place, per Rob Nagler.
-
-* Tue Oct 16 2007 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.1-1
-- Update to 1.3.1
-- Updated patch2
-
-* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.1-3
-- Rebuild for selinux ppc32 issue.
-
-* Mon Jul 2 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.1-2
-- Fix build problems (removed template_gis, per discussion with upstream).
-
-* Mon Feb 19 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.1-1
-- Update to 1.2.1
-- Removed configure patch (it is in the upstream now)
-- Added postgresql-jdbc as as dependency to -jdbc package, per Guillaume
-- move strip to correct place, per Guillaume
-- Fix long-standing post/postun problem, per Guillaume
-
-* Wed Jan 3 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.0-4
-- Added postgis.so among installed files, per Jon Burgess.
-- Fix jdbc jar dedection problem
-
-* Wed Dec 27 2006 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.0-3
-- Fix Requires for subpackages per bugzilla review #220743
-
-* Mon Dec 26 2006 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.0-2
-- More spec file fixes per bugzilla review #220743
-
-* Mon Dec 25 2006 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.0-1
-- Initial submission for Fedora Core Extras
-- Spec file changes and fixes per FC Extras packaging guidelines
-
-* Fri Jun 23 2006 - Devrim GUNDUZ <devrim at commandprompt.com> 1.1.2-2
-- Update to 1.1.2
-
-* Tue Dec 22 2005 - Devrim GUNDUZ <devrim at commandprompt.com> 1.1.0-2
-- Final fixes for 1.1.0
-
-* Tue Dec 06 2005 - Devrim GUNDUZ <devrim at gunduz.org>
-- Update to 1.1.0
-
-* Mon Oct 03 2005 - Devrim GUNDUZ <devrim at gunduz.org>
-- Make PostGIS build against pgxs so that we don't need PostgreSQL sources.
-- Fixed all build errors except jdbc (so, defaulted to 0)
-- Added new files under %%utils
-- Removed postgis-jdbc2-makefile.patch (applied to -head)
-                                                                                                    
-* Tue Sep 27 2005 - Devrim GUNDUZ <devrim at gunduz.org>
-- Update to 1.0.4
-
-* Sun Apr 20 2005 - Devrim GUNDUZ <devrim at gunduz.org>
-- 1.0.0 Gold
-
-* Sun Apr 17 2005 - Devrim GUNDUZ <devrim at gunduz.org>
-- Modified the spec file so that we can build JDBC2 RPMs...
-- Added -utils RPM to package list.
-
-* Fri Apr 15 2005 - Devrim GUNDUZ <devrim at gunduz.org>
-- Added preun and postun scripts.
-
-* Sat Apr 09 2005 - Devrim GUNDUZ <devrim at gunduz.org>
-- Initial RPM build
-- Fixed libdir so that PostgreSQL installations will not complain about it.
-- Enabled --with-geos and modified the old spec.
+* Thu Jul 1 2010 Devrim GÜNDÜZ <devrim at gunduz.org> - 1.5.1-1
+- Initial packaging for EL-6.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgis/EL-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	11 Mar 2010 19:06:59 -0000	1.15
+++ sources	1 Jul 2010 16:22:58 -0000	1.16
@@ -1,4 +1,2 @@
-768be89aca95ff180c87caea491061c3  postgis-1.4.1.pdf
-78d13c4294f3336502ad35c8a30e5583  postgis-1.4.1.tar.gz
-b581e9ea5917610d5714c279dab4c471  postgis-1.4.2.tar.gz
-f6fe0824f054754e9c18727a5bbf2e40  postgis-1.4.2.pdf
+8353b38c38282b2192f01693f71b8d28  postgis-1.5.1.tar.gz
+3dba0e0c6924092245445e8abe67ec6d  postgis-1.5.1.pdf

