From baac25ce91ad7ad4d27acda410e26f647f55bf18597df742f0f38c54bc1e146a Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 26 Sep 2024 11:56:55 +0000 Subject: [PATCH] - Sync spec file from postgresql17. OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql16?expand=0&rev=35 --- postgresql16.changes | 5 +++++ postgresql16.spec | 30 ++++++++++++++---------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/postgresql16.changes b/postgresql16.changes index 6b82d0d..07bdced 100644 --- a/postgresql16.changes +++ b/postgresql16.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 26 11:03:24 UTC 2024 - Reinhard Max + +- Sync spec file from postgresql17. + ------------------------------------------------------------------- Fri Sep 20 22:16:10 UTC 2024 - Antonio Teixeira diff --git a/postgresql16.spec b/postgresql16.spec index d4e701d..5d61a15 100644 --- a/postgresql16.spec +++ b/postgresql16.spec @@ -20,6 +20,7 @@ %define pgmajor 16 %define buildlibs 0 %define tarversion %{pgversion} +%define oldest_supported_llvm_ver 7 %define latest_supported_llvm_ver 18 ### CUT HERE ### @@ -73,6 +74,12 @@ Name: %pgname %bcond_without libzstd %endif +%if %{without derived} +BuildRequires: bison +BuildRequires: docbook-xsl-stylesheets +BuildRequires: flex +BuildRequires: perl +%endif %if %mini %bcond_with selinux %if %pgmajor >= 16 @@ -94,12 +101,6 @@ BuildRequires: zlib-devel %if %{with liblz4} BuildRequires: pkgconfig(liblz4) %endif -%if %{without derived} -BuildRequires: bison -BuildRequires: docbook-xsl-stylesheets -BuildRequires: flex -BuildRequires: perl -%endif %if %{with libzstd} BuildRequires: pkgconfig(libzstd) @@ -144,13 +145,8 @@ BuildRequires: libselinux-devel %endif %if %{with llvm} BuildRequires: gcc-c++ -%if 0%{?product_libs_llvm_ver} > %{latest_supported_llvm_ver} -BuildRequires: clang%{latest_supported_llvm_ver} -BuildRequires: llvm%{latest_supported_llvm_ver}-devel -%else -BuildRequires: clang -BuildRequires: llvm-devel -%endif +BuildRequires: (cmake(Clang) >= %{oldest_supported_llvm_ver} with cmake(Clang) <= %{latest_supported_llvm_ver}) +BuildRequires: (cmake(LLVM) >= %{oldest_supported_llvm_ver} with cmake(LLVM) <= %{latest_supported_llvm_ver}) %endif BuildRequires: libxslt-devel BuildRequires: openldap2-devel @@ -612,6 +608,7 @@ VLANG=%pgmajor make DESTDIR=%buildroot PACKAGE_TARNAME=%pgname -C src/include install make DESTDIR=%buildroot PACKAGE_TARNAME=%pgname -C src/interfaces install rm -rf %buildroot%pgincludedir/server +rm -rf %buildroot%pgdatadir %else make DESTDIR=%buildroot PACKAGE_TARNAME=%pgname install install-docs %if 0 @@ -774,8 +771,6 @@ done %endif popd -mkdir -p %buildroot%pgmandir/man1 -cp -a doc/src/sgml/man1/ecpg.1 %buildroot%pgmandir/man1/ecpg.1pg%pgmajor %find_lang ecpg-$VLANG devel.files # The devel subpackage is exclusive across versions # and not handled by update-alternatives. @@ -793,8 +788,10 @@ cat server-devel.files >> devel.files # Build up the file lists for the libpq and libecpg packages cat > libpq.files <> libpq.files %find_lang libpq5-$VLANG libpq.files @@ -980,12 +977,13 @@ fi %_libdir/pkgconfig/* %_libdir/lib*.so %pgincludedir + %if %{with server_devel} %exclude %pgincludedir/server %endif -%doc %pgmandir/man1/ecpg.1* %if !%mini +%doc %pgmandir/man1/ecpg.1* %if %{with server_devel} %files server-devel -f server-devel.files %endif