diff --git a/.cvsignore b/.cvsignore index 2f82499..085d92b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -postgis-1.5.0rc2.tar.gz -postgis-1.5.0rc2.pdf +postgis-1.5.0.tar.gz +postgis-1.5.0.pdf diff --git a/postgis.spec b/postgis.spec index 67dfc9c..a757ecc 100644 --- a/postgis.spec +++ b/postgis.spec @@ -7,11 +7,11 @@ Summary: Geographic Information Systems Extensions to PostgreSQL Name: postgis Version: 1.5.0 -Release: rc2_1%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Databases -Source0: http://postgis.refractions.net/download/%{name}-%{version}rc2.tar.gz -Source2: http://www.postgis.org/download/%{name}-%{version}rc2.pdf +Source0: http://postgis.refractions.net/download/%{name}-%{version}.tar.gz +Source2: http://www.postgis.org/download/%{name}-%{version}.pdf Source4: filter-requires-perl-Pg.sh URL: http://postgis.refractions.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,7 +66,7 @@ The postgis-utils package provides the utilities for PostGIS. %define __perl_requires %{SOURCE4} %prep -%setup -q -n %{name}-%{version}rc2 +%setup -q -n %{name}-%{version} # Copy .pdf file to top directory before installing. cp -p %{SOURCE2} . @@ -76,7 +76,7 @@ cp -p %{SOURCE2} . make LPATH=`pg_config --pkglibdir` shlib="%{name}.so" %if %javabuild -export BUILDXML_DIR=%{_builddir}/%{name}-%{version}rc2/java/jdbc +export BUILDXML_DIR=%{_builddir}/%{name}-%{version}/java/jdbc JDBC_VERSION_RPM=`rpm -ql postgresql-jdbc| grep 'jdbc2.jar$'|awk -F '/' '{print $5}'` sed 's/postgresql.jar/'${JDBC_VERSION_RPM}'/g' $BUILDXML_DIR/build.xml > $BUILDXML_DIR/build.xml.new mv -f $BUILDXML_DIR/build.xml.new $BUILDXML_DIR/build.xml @@ -106,7 +106,7 @@ fi %if %javabuild install -d %{buildroot}%{_javadir} -install -m 755 java/jdbc/%{name}-%{version}rc2.jar %{buildroot}%{_javadir} +install -m 755 java/jdbc/%{name}-%{version}.jar %{buildroot}%{_javadir} %if %{gcj_support} aot-compile-rpm %endif @@ -140,7 +140,7 @@ rm -rf %{buildroot} %files jdbc %defattr(-,root,root) %doc java/jdbc/COPYING_LGPL java/jdbc/README -%attr(755,root,root) %{_javadir}/%{name}-%{version}rc2.jar +%attr(755,root,root) %{_javadir}/%{name}-%{version}.jar %if %{gcj_support} %dir %{_libdir}/gcj/%{name} %{_libdir}/gcj/%{name}/*.jar.so @@ -170,17 +170,9 @@ rm -rf %{buildroot} %doc postgis*.pdf %changelog -* Wed Feb 3 2010 Devrim GÜNDÜZ - 1.5.0rc2-1 -- Update to 1.5.0 rc2 - -* Thu Jan 21 2010 Devrim GÜNDÜZ - 1.5.0rc1-1 -- Update to 1.5.0 rc1 - -* Tue Jan 19 2010 Devrim GÜNDÜZ - 1.5.0b2-1 -- Update to 1.5.0 beta2 - -* Tue Jan 12 2010 Devrim GÜNDÜZ - 1.5.0-b1-1 -- Update to 1.5.0 beta1 +* Tue Jan 12 2010 Devrim GÜNDÜZ - 1.5.0-1 +- Update to 1.5.0 +- Trim changelog a bit. * Wed Jan 6 2010 Devrim GÜNDÜZ - 1.4.1-2 - Add shp2pgsql-{cli-gui} among installed files. @@ -212,117 +204,3 @@ rm -rf %{buildroot} * Mon Jul 6 2009 Devrim GUNDUZ - 1.4.0rc1-1 - Update to 1.4.0rc1 - Fix spec for 1.4 - -* Thu Jun 18 2009 Devrim GUNDUZ - 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 - 1.3.6-1 -- Update to 1.3.6 - -* Fri Apr 24 2009 Milos Jakubicek - 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 - 1.3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 16 2008 Devrim GUNDUZ - 1.3.5-1 -- Update to 1.3.5 - -* Sat Nov 29 2008 Devrim GUNDUZ - 1.3.4-1 -- Update to 1.3.4 - -* Mon Aug 11 2008 Devrim GUNDUZ - 1.3.3-4 -- Fix #451387. Patch from Toshio. - -* Thu Jun 26 2008 Devrim GUNDUZ - 1.3.3-3 -- Rebuilt against geos 3.0.0 - -* Thu May 29 2008 Todd Zullinger - 1.3.3-2 -- fix license tags - -* Sun Apr 13 2008 Devrim GUNDUZ - 1.3.3-1 -- Update to 1.3.3 - -* Mon Feb 18 2008 Fedora Release Engineering - 1.3.2-3.1 -- Autorebuild for GCC 4.3 - -* Mon Jan 21 2008 - Devrim GUNDUZ 1.3.2-2.1 -- Rebuilt against PostgreSQL 8.3 - -* Sat Jan 5 2008 Devrim GUNDUZ - 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 - 1.3.2-1 -- Update to 1.3.2 -- Updated patch2 - -* Wed Nov 21 2007 Devrim GUNDUZ - 1.3.1-2 -- Move postgresql-jdbc dependency to the correct place, per Rob Nagler. - -* Tue Oct 16 2007 Devrim GUNDUZ - 1.3.1-1 -- Update to 1.3.1 -- Updated patch2 - -* Tue Aug 28 2007 Fedora Release Engineering - 1.2.1-3 -- Rebuild for selinux ppc32 issue. - -* Mon Jul 2 2007 - Devrim GUNDUZ 1.2.1-2 -- Fix build problems (removed template_gis, per discussion with upstream). - -* Mon Feb 19 2007 - Devrim GUNDUZ 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 1.2.0-4 -- Added postgis.so among installed files, per Jon Burgess. -- Fix jdbc jar dedection problem - -* Wed Dec 27 2006 - Devrim GUNDUZ 1.2.0-3 -- Fix Requires for subpackages per bugzilla review #220743 - -* Mon Dec 26 2006 - Devrim GUNDUZ 1.2.0-2 -- More spec file fixes per bugzilla review #220743 - -* Mon Dec 25 2006 - Devrim GUNDUZ 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 1.1.2-2 -- Update to 1.1.2 - -* Tue Dec 22 2005 - Devrim GUNDUZ 1.1.0-2 -- Final fixes for 1.1.0 - -* Tue Dec 06 2005 - Devrim GUNDUZ -- Update to 1.1.0 - -* Mon Oct 03 2005 - Devrim GUNDUZ -- 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 -- Update to 1.0.4 - -* Sun Apr 20 2005 - Devrim GUNDUZ -- 1.0.0 Gold - -* Sun Apr 17 2005 - Devrim GUNDUZ -- Modified the spec file so that we can build JDBC2 RPMs... -- Added -utils RPM to package list. - -* Fri Apr 15 2005 - Devrim GUNDUZ -- Added preun and postun scripts. - -* Sat Apr 09 2005 - Devrim GUNDUZ -- Initial RPM build -- Fixed libdir so that PostgreSQL installations will not complain about it. -- Enabled --with-geos and modified the old spec. diff --git a/sources b/sources index 7ea7986..3b6d9c5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -db31baba24aec950c49093c3021b814c postgis-1.5.0rc2.tar.gz -c001e28dc4d9952fde920bbb6e0c6988 postgis-1.5.0rc2.pdf +8c0d291296033deee4d7f545e5d8218f postgis-1.5.0.tar.gz +207ee6c233d9a2bcea4247583390630f postgis-1.5.0.pdf