- updated to 4.4.7, removed obsolete am16 patch

Changed files:
    proj-am16.patch -> 1.2
    proj.spec -> 1.7

diff --git a/proj-am16.patch b/proj-am16.patch
deleted file mode 100644 (file)
index 0212d04..0000000
--- a/proj-am16.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- proj-4.4.5/src/Makefile.am~        Sun Jun  2 09:27:22 2002
-+++ proj-4.4.5/src/Makefile.am Sun Jun  2 09:27:22 2002
-@@ -10,7 +10,7 @@
- cs2cs_SOURCES = cs2cs.c gen_cheb.c p_series.c
- nad2nad_SOURCES = nad2nad.c 
- nad2bin_SOURCES = nad2bin.c
--geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c emess.c geodesic.h
-+geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c geodesic.h
- 
- proj_LDADD = libproj.la
- cs2cs_LDADD = libproj.la

diff --git a/proj.spec b/proj.spec
index 09ebe317b6575b366b69fac21468a0c61da646aa..8d268310147fb667bc4bdbffdc10b2f5799b5921 100644 (file)
--- a/proj.spec
+++ b/proj.spec
@@ -1,7 +1,7 @@
 Summary:       Cartographic projection software
 Summary(pl):   Oprogramowanie do rzutów kartograficznych
 Name:          proj
-Version:       4.4.5
+Version:       4.4.7
 Release:       1
 Group:         Libraries
 License:       MIT
@@ -10,7 +10,6 @@ Source1:      ftp://ftp.remotesensing.org/pub/proj/OF90-284.pdf
 Source2:       ftp://ftp.remotesensing.org/pub/proj/PROJ.4.3.pdf
 Source3:       ftp://ftp.remotesensing.org/pub/proj/SWISS.pdf
 Source4:       ftp://ftp.remotesensing.org/pub/proj/PROJ.4.3.I2.pdf
-Patch0:                %{name}-am16.patch
 URL:           http://www.remotesensing.org/proj/
 BuildRequires: automake
 BuildRequires: autoconf
@@ -77,7 +76,6 @@ Dokumentacja do oprogramowania do rzut
 
 %prep
 %setup -q
-%patch0 -p1
 cp -f %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 
 %build
@@ -105,15 +103,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README nad/nad.lst
+%doc AUTHORS COPYING ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libproj.so.*.*
 %dir %{_datadir}/proj
 %{_datadir}/proj/GL27
 %{_datadir}/proj/nad27
 %{_datadir}/proj/nad83
+%{_datadir}/proj/nad.lst
 %{_datadir}/proj/proj_def.dat
 %{_datadir}/proj/world
 %{_datadir}/proj/epsg
+%{_datadir}/proj/esri
 
 %files devel
 %defattr(644,root,root,755)
@@ -128,7 +128,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files progs
 %defattr(644,root,root,755)
-%doc *.ps
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*