diff --git a/proj-4.9.3.tar.gz b/proj-4.9.3.tar.gz
deleted file mode 100644
index e3426c8..0000000
Binary files a/proj-4.9.3.tar.gz and /dev/null differ
diff --git a/proj-8.2.1.tar.gz b/proj-8.2.1.tar.gz
new file mode 100644
index 0000000..0408b8b
Binary files /dev/null and b/proj-8.2.1.tar.gz differ
diff --git a/proj-datumgrid-1.6.zip b/proj-datumgrid-1.6.zip
deleted file mode 100644
index 8d3926c..0000000
Binary files a/proj-datumgrid-1.6.zip and /dev/null differ
diff --git a/proj-datumgrid-1.7.tar.gz b/proj-datumgrid-1.7.tar.gz
new file mode 100644
index 0000000..435309c
Binary files /dev/null and b/proj-datumgrid-1.7.tar.gz differ
diff --git a/proj.spec b/proj.spec
index ce566d8..9e70657 100644
--- a/proj.spec
+++ b/proj.spec
@@ -1,12 +1,13 @@
 Name:             proj
-Version:          4.9.3
-Release:          8
+Version:          8.2.1
+Release:          1
 Summary:          A generic coordinate transformation software
 License:          MIT
 URL:              https://proj4.org
 Source0:          http://download.osgeo.org/proj/proj-%{version}.tar.gz
-Source1:          http://download.osgeo.org/proj/proj-datumgrid-1.6.zip
+Source1:          http://download.osgeo.org/proj/proj-datumgrid-1.7.tar.gz
 BuildRequires:    libtool
+BuildRequires:    gcc-c++ sqlite-devel libtiff-devel curl-devel
 
 %description
 PROJ is a generic coordinate transformation software that transforms
@@ -38,27 +39,8 @@ Requires:         proj = %{version}-%{release}
 %description      nad
 This package contains additional US and Canadian datum shift grids.
 
-%package          epsg
-Summary:          EPSG dataset for PROJ.4
-Requires:         proj = %{version}-%{release}
-
-%description      epsg
-This package contains additional EPSG dataset.
-
 %prep
-%autosetup -n proj-%{version}
-
-for makefile in `find . -type f -name 'Makefile.in'`; do
-sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' $makefile
-done
-
-pushd nad
-unzip -o %{SOURCE1}
-cd ..
-
-for script in `find nad/ -type f -perm -a+x`; do
-sed -i -e '1,1s|:|#!/bin/bash|' $script
-done
+%autosetup -n proj-%{version} -p1
 
 %build
 sed -i -e 's|5\:4\:5|6\:4\:6|' src/Makefile*
@@ -67,19 +49,13 @@ sed -i -e 's|5\:4\:5|6\:4\:6|' src/Makefile*
 
 %install
 %makeinstall
-install -p -m 0644 nad/pj_out27.dist nad/pj_out83.dist nad/td_out.dist %{buildroot}%{_datadir}/proj
-install -p -m 0755 nad/test27 nad/test83 nad/testvarious %{buildroot}%{_datadir}/proj
-install -p -m 0644 nad/epsg %{buildroot}%{_datadir}/proj
-install -p -m 0644 src/projects.h %{buildroot}%{_includedir}/
+tar -C %{buildroot}%{_datadir}/%{name} -xf %{SOURCE1}
+find %{buildroot} -type f -name "*.la" -delete -print
+# It would be good to find out where these extra files# come from:
+rm -rf %{buildroot}%{_datadir}/doc/${name}
 
 %check
-cd nad
-export PROJ_LIB=%{buildroot}%{_datadir}/proj
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH%{buildroot}%{_libdir}
-for i in 27 83 IGNF ntv2 various;do
-./test$i      %{buildroot}%{_bindir}/proj || exit 0
-done
-cd -
+./test$i      %{buildroot}%{_bindir}/proj ||:
 
 %post
 /sbin/ldconfig
@@ -89,29 +65,25 @@ cd -
 %files
 %doc AUTHORS COPYING
 %{_bindir}/*
-%{_libdir}/libproj.so.12*
+%{_libdir}/libproj.so.22*
 
 %files help
 %doc NEWS README ChangeLog
 %{_mandir}/man1/*.1*
-%{_mandir}/man3/*.3*
 
 %files devel
 %{_includedir}/*.h
+%{_includedir}/proj
 %{_libdir}/{libproj.so,libproj.a,libproj.la}
 %attr(0755,root,root) %{_libdir}/pkgconfig/proj.pc
 
 %files nad
-%doc nad/README
-%attr(0755,root,root) %{_datadir}/proj/{test27,test83,testvarious}
 %attr(0755,root,root) %{_libdir}/pkgconfig/proj.pc
 %{_datadir}/proj
-%exclude %{_datadir}/proj/epsg
-
-%files epsg
-%doc nad/README
-%attr(0644,root,root) %{_datadir}/proj/epsg
 
 %changelog
+* Tue Jan 18 2022 yaoxin <yaoxin30@huawei.com> - 8.2.1-1
+- Upgrade proj to 8.2.1
+
 * Wed Feb 19 2020 Senlin Xia <xiasenlin1@huawei.com> 4.9.3-8
 - package init