diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/postgresql16-postgis.spec b/postgresql16-postgis.spec index cd941ed..7cc0776 100644 --- a/postgresql16-postgis.spec +++ b/postgresql16-postgis.spec @@ -24,7 +24,7 @@ Name: postgresql%{pgversion}-%{sname} Version: 3.5.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Geographic Information Systems Extensions to PostgreSQL License: GPL-2.0-or-later @@ -36,8 +36,8 @@ Source3: https://download.osgeo.org/%{sname}/source/%{sname}-%{prevversion # Add proj8 compatibility to postgis-2.x (needed for upgrade package) Patch1: postgis2-proj8.patch -Patch2: postgis-c99.patch -Patch3: postgis-c99-2.patch +Patch2: postgis-c99.patch +Patch3: postgis-c99-2.patch %endif %if %?postgresql_default @@ -206,9 +206,9 @@ The postgis-upgrade package contains the previous version of Postgis as well as the current version of Postgis built against the previous version of PostgreSQL necessary for correct dump of schema from previous version of PostgreSQL. %else -The postgis-upgrade package contains the current version of Postgis built against -the previous version of PostgreSQL necessary for correct dump of schema from previous -version of PostgreSQL. +The postgis-upgrade package contains the current version of Postgis built +against the previous version of PostgreSQL necessary for correct dump of schema +from the previous version of PostgreSQL. %endif %endif @@ -258,11 +258,11 @@ cp -p %{SOURCE2} . %build %configure %configure_opts --with-pgconfig=%{_bindir}/pg_server_config \ %if %llvmjit - --with-llvm \ + --with-llvm \ %endif %if 0%{?fedora} - --with-sfcgal \ - --with-gui + --with-sfcgal \ + --with-gui %endif sed -i 's| -fstack-clash-protection | |' postgis/Makefile @@ -296,12 +296,12 @@ cd %{sname}-%{version} # pre-defined directories, and not everything from postgis-%%prevversion # directory respects the `pg_config` output (liblwgeom especially). ./configure %configure_opts \ - --with-pgconfig=%postgresql_upgrade_prefix/bin/pg_config \ - --bindir=%postgresql_upgrade_prefix/bin \ - --libdir=%postgresql_upgrade_prefix/lib \ - --includedir=%postgresql_upgrade_prefix/include \ - --datadir=%postgresql_upgrade_prefix/share \ - --mandir=%postgresql_upgrade_prefix/share/man + --with-pgconfig=%postgresql_upgrade_prefix/bin/pg_config \ + --bindir=%postgresql_upgrade_prefix/bin \ + --libdir=%postgresql_upgrade_prefix/lib \ + --includedir=%postgresql_upgrade_prefix/include \ + --datadir=%postgresql_upgrade_prefix/share \ + --mandir=%postgresql_upgrade_prefix/share/man sed -i 's| -fstack-clash-protection | |' postgis/Makefile sed -i 's| -fstack-clash-protection | |' raster/rt_pg/Makefile sed -i 's| -fstack-clash-protection | |' topology/Makefile @@ -331,9 +331,9 @@ done # pre-defined directories, and not everything from postgis-%%prevversion # directory respects the `pg_config` output (liblwgeom especially). ./configure %configure_opts \ - --with-pgconfig=%postgresql_upgrade_prefix/bin/pg_config \ - --libdir=%postgresql_upgrade_prefix/lib \ - --includedir=%postgresql_upgrade_prefix/include + --with-pgconfig=%postgresql_upgrade_prefix/bin/pg_config \ + --libdir=%postgresql_upgrade_prefix/lib \ + --includedir=%postgresql_upgrade_prefix/include sed -i 's| -fstack-clash-protection | |' postgis/Makefile sed -i 's| -fstack-clash-protection | |' raster/rt_pg/Makefile sed -i 's| -fstack-clash-protection | |' topology/Makefile @@ -380,8 +380,15 @@ strip %{buildroot}/%{_libdir}/gcj/%{sname}/*.jar.so %endif %if %utils +pushd utils install -d %{buildroot}%{_datadir}/%{sname} -install -m 755 utils/*.pl %{buildroot}%{_datadir}/%{sname} +install -m 755 create_*.pl repo_revision.pl \ + %{sname}_restore.pl read_scripts_version.pl \ +%if 0%{?fedora} + profile_intersects.pl test_*.pl \ +%endif + %{buildroot}%{_datadir}/%{sname} +popd %endif find %buildroot \( -name '*.la' -or -name '*.a' \) -delete @@ -396,8 +403,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/shp2pgsql-gui.deskto export PGIS_REG_TMPDIR=`mktemp -d` if ! LD_LIBRARY_PATH=%{buildroot}%_libdir make check %{_smp_mflags} ; then for file in $(find $PGIS_REG_TMPDIR -name '*_diff'); do - echo "== $file ==" - cat "$file" + echo "== $file ==" + cat "$file" done fi %endif @@ -507,16 +514,19 @@ fi %doc utils/README %dir %{_datadir}/%{sname}/ %doc %{_datadir}/doc/pgsql/extension/README.address_standardizer -%{_datadir}/%{sname}/test_estimation.pl -%{_datadir}/%{sname}/profile_intersects.pl -%{_datadir}/%{sname}/test_joinestimation.pl %{_datadir}/%{sname}/create_extension_unpackage.pl -%{_datadir}/%{sname}/%{sname}_restore.pl -%{_datadir}/%{sname}/read_scripts_version.pl -%{_datadir}/%{sname}/test_geography_estimation.pl -%{_datadir}/%{sname}/test_geography_joinestimation.pl %{_datadir}/%{sname}/create_or_replace_to_create.pl %{_datadir}/%{sname}/create_upgrade.pl +%{_datadir}/%{sname}/%{sname}_restore.pl +%{_datadir}/%{sname}/read_scripts_version.pl +%if 0%{?fedora} +# requires perl(Pg) +%{_datadir}/%{sname}/profile_intersects.pl +%{_datadir}/%{sname}/test_estimation.pl +%{_datadir}/%{sname}/test_geography_estimation.pl +%{_datadir}/%{sname}/test_geography_joinestimation.pl +%{_datadir}/%{sname}/test_joinestimation.pl +%endif %endif @@ -525,6 +535,10 @@ fi %changelog +* Wed Oct 22 2025 Petr Khartskhaev - 3.5.3-4 +- Avoid perl(Pg) dependency on RHEL, adapted from + the Fedora spec change from yselkowi@redhat.com + * Tue Jul 29 2025 Sandro Mani - 3.5.3-3 - Rebuild (gdal)