Accepting request 1280321 from devel:languages:misc

OBS-URL: https://build.opensuse.org/request/show/1280321
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qore-pgsql-module?expand=0&rev=10

module-pgsql-3.2.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b906d6d9609078fe70e94db4c322909e23753b6884777e617c7e19982a63dda
-size 198975

module-psql-3.2.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8ad61dc216fc94a099b39849c12b6c114466fe8baa134563e4a1fb90d751912
+size 587345

qore-pgsql-module.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon May 12 14:26:59 UTC 2025 - Sarah Kriesch <sarah.kriesch@opensuse.org>
+
+- Remove clean section
+
+-------------------------------------------------------------------
+Mon May 12 14:03:38 UTC 2025 - Sarah Kriesch <sarah.kriesch@opensuse.org>
+
+- Add if case for qore >= 2.0 regarding qore-stdlib
+
+-------------------------------------------------------------------
+Sun May 11 20:22:18 UTC 2025 - Sarah Kriesch <sarah.kriesch@opensuse.org>
+
+- Adopt configuration for cmake4.0 and new qore 
+
 -------------------------------------------------------------------
 Mon Jul  1 10:39:51 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

qore-pgsql-module.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qore-pgsql-module
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 %define module_api   %(qore --latest-module-api 2>/dev/null)
-%define src_name     module-pgsql-%{version}
+%define src_name     module-psql-%{version}
 Name:           qore-pgsql-module
 Version:        3.2.0
 Release:        0
@@ -25,8 +25,9 @@ Summary:        PostgreSQL DBI module for Qore
 License:        GPL-2.0-or-later OR LGPL-2.0-or-later OR MIT
 Group:          Development/Languages/Other
 URL:            http://qore.org
-Source:         https://github.com/qorelanguage/module-pgsql/archive/refs/tags/v%{version}.tar.gz#/%{src_name}.tar.gz
-BuildRequires:  cmake
+Source:         https://github.com/qorelanguage/module-pgsql/releases/download/v%{version}/qore-pgsql-module-%{version}.tar.bz2#/%{src_name}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  cmake >= 3.5
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -39,7 +40,9 @@ BuildRequires:  postgresql-devel
 %endif
 BuildRequires:  qore
 BuildRequires:  qore-devel >= 1.0.0
+BuildRequires:  (qore-stdlib if qore >= 2.0)
 Requires:       qore-module(abi)%{?_isa} = %{module_api}
+Requires:       /usr/bin/env
 
 %description
 PostgreSQL DBI driver module for the Qore Programming Language. The PostgreSQL
@@ -56,22 +59,32 @@ PostgreSQL module for the Qore Programming Language.
 This package provides API documentation, test and example programs
 
 %prep
-%setup -q -n %{src_name}
+%setup -q -n qore-pgsql-module-%{version}
 
 %build
-%cmake -Denable-scu=OFF
-%cmake_build docs
+# Remove cmake4 error due to not setting
+# min cmake version - sflees.de
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
+export CXXFLAGS="%{?optflags}"
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DCMAKE_SKIP_RPATH=1 -DCMAKE_SKIP_INSTALL_RPATH=1 -DCMAKE_SKIP_BUILD_RPATH=1 -DCMAKE_PREFIX_PATH=${_prefix}/lib64/cmake/Qore .
+make %{?_smp_mflags}
+make %{?_smp_mflags} docs
+sed -i 's/#!\/usr\/bin\/env qore/#!\/usr\/bin\/qore/' test/*.qtest
 
 %install
-%cmake_install
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %fdupes -s %{__builddir}/html
 
+
 %files
+%defattr(-,root,root,-)
+%{_libdir}/qore-modules
 %license COPYING.LGPL COPYING.MIT
 %doc README RELEASE-NOTES AUTHORS
-%{_libdir}/qore-modules
+
 
 %files doc
-%doc %{__builddir}/docs/pgsql/html
+%defattr(-,root,root,-)
+%doc docs/pgsql/html test/pgsql.qtest test/sql-stmt.q
 
 %changelog