PROJ 9.7: Use correct paths for the files. Broken since 9.7.0-1. Also add SLES 16...

diff --git a/rpm/redhat/main/common/proj97/main/proj97.spec b/rpm/redhat/main/common/proj97/main/proj97.spec
index 6574cb4c489ca20f10288183650f20502619ca5d..c9b010c2b381435c73ace6bad6a02eb1573bd65d 100644 (file)
--- a/rpm/redhat/main/common/proj97/main/proj97.spec
+++ b/rpm/redhat/main/common/proj97/main/proj97.spec
@@ -5,7 +5,7 @@
 
 Name:          %{sname}97
 Version:       9.7.0
-Release:       2PGDG%{?dist}
+Release:       3PGDG%{?dist}
 Epoch:         0
 Summary:       Cartographic projection software (PROJ)
 
@@ -17,16 +17,16 @@ Source2:    %{name}-pgdg-libs.conf
 BuildRequires: sqlite-devel >= 3.7 libcurl-devel cmake
 BuildRequires: libtiff-devel pgdg-srpm-macros >= 1.0.51
 
-# Default GCC version on SLES 15 is not sufficient to build PROJ 9.4,
+# Default GCC version on SLES 15 is not sufficient to build PROJ 9.7,
 # so use a newer one:
-%if 0%{?suse_version} >= 1500
+%if 0%{?suse_version} == 1500
 BuildRequires: gcc12-c++
 %else
 # The rest is safe:
 BuildRequires: gcc-c++
 %endif
 
-%if 0%{?suse_version} >= 1500
+%if 0%{?suse_version} == 1500
 # Unfortunately SLES 15 ships the libraries with -devel subpackage:
 Requires:      sqlite3-devel >= 3.7
 %else
@@ -54,10 +54,10 @@ This package contains libproj and the appropriate header files and man pages.
 
 %{__install} -d build
 pushd build
-LDFLAGS="-Wl,-rpath,%{proj96instdir}/lib64 ${LDFLAGS}" ; export LDFLAGS
-SHLIB_LINK="$SHLIB_LINK -Wl,-rpath,%{proj96instdir}/lib64" ; export SHLIB_LINK
+LDFLAGS="-Wl,-rpath,%{proj97instdir}/lib64 ${LDFLAGS}" ; export LDFLAGS
+SHLIB_LINK="$SHLIB_LINK -Wl,-rpath,%{proj97instdir}/lib64" ; export SHLIB_LINK
 
-%if 0%{?suse_version} >= 1500
+%if 0%{?suse_version} == 1500
 export CXX=/usr/bin/g++-12
 %endif
 
@@ -66,7 +66,7 @@ cmake ..\
 %else
 cmake3 .. \
 %endif
-       -DCMAKE_INSTALL_PREFIX:PATH=%{proj96instdir} \
+       -DCMAKE_INSTALL_PREFIX:PATH=%{proj97instdir} \
        -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
        -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}"
 
@@ -79,9 +79,9 @@ pushd build
        DESTDIR=%{buildroot}
 popd
 
-%{__install} -d %{buildroot}%{proj96instdir}/share/%{sname}
-%{__install} -d %{buildroot}%{proj96instdir}/share/doc/
-%{__install} -p -m 0644 NEWS.md AUTHORS.md COPYING README.md ChangeLog %{buildroot}%{proj96instdir}/share/doc/
+%{__install} -d %{buildroot}%{proj97instdir}/share/%{sname}
+%{__install} -d %{buildroot}%{proj97instdir}/share/doc/
+%{__install} -p -m 0644 NEWS.md AUTHORS.md COPYING README.md ChangeLog %{buildroot}%{proj97instdir}/share/doc/
 
 # Install linker config file:
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
@@ -95,25 +95,29 @@ popd
 
 %files
 %defattr(-,root,root,-)
-%doc %{proj96instdir}/share/doc/*
-%{proj96instdir}/share/bash-completion/completions/projinfo
-%{proj96instdir}/bin/*
-%{proj96instdir}/share/man/man1/*.1
-%{proj96instdir}/share/proj/*
-%{proj96instdir}/lib64/libproj.so.25*
+%doc %{proj97instdir}/share/doc/*
+%{proj97instdir}/share/bash-completion/completions/projinfo
+%{proj97instdir}/bin/*
+%{proj97instdir}/share/man/man1/*.1
+%{proj97instdir}/share/proj/*
+%{proj97instdir}/lib64/libproj.so.25*
 %config(noreplace) %attr (644,root,root) %{_sysconfdir}/ld.so.conf.d/%{name}-pgdg-libs.conf
 
 %files devel
 %defattr(-,root,root,-)
-%{proj96instdir}/share/man/man1/*.1
-%{proj96instdir}/include/*.h
-%{proj96instdir}/include/proj/*
-%{proj96instdir}/lib64/*.so
-%attr(0755,root,root) %{proj96instdir}/lib64/pkgconfig/%{sname}.pc
-%{proj96instdir}/lib64/cmake/%{sname}/*cmake
-%{proj96instdir}/lib64/cmake/%{sname}4/*cmake
+%{proj97instdir}/share/man/man1/*.1
+%{proj97instdir}/include/*.h
+%{proj97instdir}/include/proj/*
+%{proj97instdir}/lib64/*.so
+%attr(0755,root,root) %{proj97instdir}/lib64/pkgconfig/%{sname}.pc
+%{proj97instdir}/lib64/cmake/%{sname}/*cmake
+%{proj97instdir}/lib64/cmake/%{sname}4/*cmake
 
 %changelog
+* Thu Oct 2 2025 Devrim Gündüz <devrim@gunduz.org> - 0:9.7.0-3PGDG
+- Use correct paths for the files. Broken since 9.7.0-1
+- Add SLES 16 support
+
 * Fri Sep 19 2025 Devrim Gündüz <devrim@gunduz.org> - 0:9.7.0-2PGDG
 - Rebuild due to a package signing issue