commit 97183760dc159a52355c0ba316d26090b4f55d59
Author: Jan Rękorajski <[email protected]>
Date: Sun Dec 8 01:18:39 2024 +0100
- up to 9.5.1
proj-am.patch | 11 ---------
proj.spec | 71 +++++++++++++++--------------------------------------------
2 files changed, 18 insertions(+), 64 deletions(-)
---
diff --git a/proj.spec b/proj.spec
index 2c014a2..ee4d54b 100644
--- a/proj.spec
+++ b/proj.spec
@@ -5,23 +5,22 @@
Summary: Cartographic projection software
Summary(pl.UTF-8): Oprogramowanie do rzutów kartograficznych
Name: proj
-Version: 6.3.2
+Version: 9.5.1
Release: 1
Group: Libraries
License: MIT
Source0: http://download.osgeo.org/proj/%{name}-%{version}.tar.gz
-# Source0-md5: 2ca6366e12cd9d34d73b4602049ee480
+# Source0-md5: 07c44ca4a65a0664ce823c8448707c78
Source1: http://download.osgeo.org/proj/%{name}-pdf-docs.tar.gz
# Source1-md5: 7c8f48f0fddf0d5730f4b27b3f09e6c1
Source2:
https://raw.githubusercontent.com/OSGeo/proj-datumgrid/master/scripts/nad2bin.c
# Source2-md5: d061e9107864c06c997cda0910de81bc
-Patch0: %{name}-am.patch
URL: http://proj.org/
-BuildRequires: autoconf >= 2.59
-BuildRequires: automake
+BuildRequires: cmake
%{?with_java:BuildRequires: jdk}
BuildRequires: libtool
BuildRequires: rpm-build >= 4.6
+Obsoletes: proj-static < 9.5.1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -43,18 +42,6 @@ This package contains proj header files.
Ten pakiet zawiera pliki nagłówkowe niezbędne do tworzenia aplikacji
korzystających z biblioteki proj.
-%package static
-Summary: proj static libraries
-Summary(pl.UTF-8): Biblioteki statyczne libPropList
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-This package contains static proj libraries.
-
-%description static -l pl.UTF-8
-Ten pakiet zawiera statyczne biblioteki proj.
-
%package progs
Summary: Cartographic projection software
Summary(pl.UTF-8): Oprogramowanie do rzutów kartograficznych
@@ -84,30 +71,26 @@ Dokumentacja do oprogramowania do rzutów kartograficznych
proj.
%prep
%setup -q -a1
-%patch0 -p1
cp %{SOURCE2} .
%build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- %{!?with_java:--without-jni}
+mkdir -p build
+cd build
+
+%cmake ../
%{__make}
# build nad2bin, removed from proj but required by e.g. grass.spec
-%{__cc} %{rpmcflags} %{rpmldflags} -o nad2bin nad2bin.c
+%{__cc} %{rpmcflags} %{rpmldflags} -o nad2bin ../nad2bin.c
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-install nad2bin $RPM_BUILD_ROOT%{_bindir}
+install build/nad2bin $RPM_BUILD_ROOT%{_bindir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -117,43 +100,23 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog CITATION NEWS README
+%doc AUTHORS.md COPYING ChangeLog CITATION NEWS.md README.md
%attr(755,root,root) %{_libdir}/libproj.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libproj.so.15
-%dir %{_datadir}/proj
-%{_datadir}/proj/CH
-%{_datadir}/proj/GL27
-%{_datadir}/proj/ITRF2000
-%{_datadir}/proj/ITRF2008
-%{_datadir}/proj/ITRF2014
-%{_datadir}/proj/nad27
-%{_datadir}/proj/nad83
-%{_datadir}/proj/nad.lst
-%{_datadir}/proj/null
-%{_datadir}/proj/world
-%{_datadir}/proj/other.extra
-%{_datadir}/proj/proj.db
-%{_datadir}/proj/projjson.schema.json
+%attr(755,root,root) %ghost %{_libdir}/libproj.so.25
+%{_datadir}/proj
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libproj.so
-%{_libdir}/libproj.la
%{_includedir}/proj
%{_includedir}/geodesic.h
-%{_includedir}/org_proj4_PJ.h
%{_includedir}/proj.h
-%{_includedir}/proj_api.h
%{_includedir}/proj_constants.h
%{_includedir}/proj_experimental.h
%{_includedir}/proj_symbol_rename.h
%{_pkgconfigdir}/proj.pc
-%{_mandir}/man3/geodesic.3*
-%{_mandir}/man3/pj_init.3*
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libproj.a
+%{_libdir}/cmake/proj
+%{_libdir}/cmake/proj4
%files progs
%defattr(644,root,root,755)
@@ -166,12 +129,14 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/nad2bin
%attr(755,root,root) %{_bindir}/proj
%attr(755,root,root) %{_bindir}/projinfo
+%attr(755,root,root) %{_bindir}/projsync
%{_mandir}/man1/cct.1*
%{_mandir}/man1/cs2cs.1*
%{_mandir}/man1/geod.1*
%{_mandir}/man1/gie.1*
%{_mandir}/man1/proj.1*
%{_mandir}/man1/projinfo.1*
+%{_mandir}/man1/projsync.1*
%files doc
%defattr(644,root,root,755)
diff --git a/proj-am.patch b/proj-am.patch
deleted file mode 100644
index 40c7740..0000000
--- a/proj-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- proj-4.8.0/src/Makefile.am.orig 2012-03-07 06:58:49.000000000 +0100
-+++ proj-4.8.0/src/Makefile.am 2012-09-29 16:13:43.999686530 +0200
-@@ -222,7 +222,7 @@
- mv $(top_srcdir)/src/wkt2_generated_parser.c.tmp
$(top_srcdir)/src/wkt2_generated_parser.c
-
-
--install-exec-local: install-binPROGRAMS
-+install-exec-hook: install-binPROGRAMS
- rm -f $(DESTDIR)$(bindir)/invproj$(EXEEXT)
- (cd $(DESTDIR)$(bindir); ln -s proj$(EXEEXT) invproj$(EXEEXT))
- rm -f $(DESTDIR)$(bindir)/invgeod$(EXEEXT)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/proj.git/commitdiff/97183760dc159a52355c0ba316d26090b4f55d59
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
