public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/soci] update-to-4.1.4: Upstream upgrade
@ 2026-06-20 4:40 Denis Arnaud
0 siblings, 0 replies; 2+ messages in thread
From: Denis Arnaud @ 2026-06-20 4:40 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/soci
Branch : update-to-4.1.4
Commit : 2fbe02146638408aef1bf7b64626e6d31ec6a216
Author : Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date : 2025-03-30T22:23:16+02:00
Stats : +5/-27 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/soci/c/2fbe02146638408aef1bf7b64626e6d31ec6a216?branch=update-to-4.1.4
Log:
Upstream upgrade
---
diff --git a/soci-uninit.patch b/soci-uninit.patch
deleted file mode 100644
index e18d380..0000000
--- a/soci-uninit.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur soci-4.0.3.orig/src/backends/mysql/session.cpp soci-4.0.3/src/backends/mysql/session.cpp
---- soci-4.0.3.orig/src/backends/mysql/session.cpp 2022-02-10 20:13:13.000000000 +0100
-+++ soci-4.0.3/src/backends/mysql/session.cpp 2022-07-10 21:20:40.846760279 +0200
-@@ -207,10 +207,12 @@
- *password_p = false;
- *db_p = false;
- *unix_socket_p = false;
-+ *port = 0;
- *port_p = false;
- *ssl_ca_p = false;
- *ssl_cert_p = false;
- *ssl_key_p = false;
-+ *local_infile = 0;
- *local_infile_p = false;
- *charset_p = false;
- *reconnect_p = false;
diff --git a/soci.spec b/soci.spec
index 41be8fc..72cad0a 100644
--- a/soci.spec
+++ b/soci.spec
@@ -22,18 +22,14 @@
##
#
Name: soci
-Version: 4.1.0.rc3
-%global ups_ver 4.1.0-rc3
+Version: 4.1.0.rc4
+%global ups_ver 4.1.0-rc4
Release: %autorelease
Summary: The database access library for C++ programmers
License: BSL-1.0
URL: https://github.com/SOCI/%{name}
Source0: %{url}/archive/v%{ups_ver}.tar.gz#/%{name}-%{version}.tar.gz
-# Works around a false positive -Wuninitialized error exposed by LTO
-# Patch submitted upstream: https://github.com/SOCI/soci/pull/1223
-Patch0: soci-uninit.patch
-
BuildRequires: dos2unix
BuildRequires: gcc gcc-c++
BuildRequires: cmake
@@ -204,19 +200,17 @@ library. The documentation is the same as at the %{name} web page.
%prep
%setup -q -n %{name}-%{ups_ver}
-%patch -P0 -p1
# Rename change-log and license file, so that they comply with
# packaging standard
mv README.md README
mv CHANGES ChangeLog
mv LICENSE_1_0.txt COPYING
-echo "2025-03-27:" > NEWS
+echo "2025-03-30:" > NEWS
echo "- Version 4.1.0" >> NEWS
echo "- See the ChangeLog file for more details." >> NEWS
# Remove the spurious executable permission
chmod a-x AUTHORS README ChangeLog COPYING NEWS
-find docs -type f -exec chmod a-x {} \;
# Unix ends of line
dos2unix AUTHORS README ChangeLog COPYING NEWS
@@ -332,7 +326,7 @@ rm -f %{buildroot}%{_libdir}/*.a
%files doc
-%doc AUTHORS ChangeLog NEWS README docs
+%doc AUTHORS ChangeLog NEWS README
%license COPYING
%changelog
diff --git a/sources b/sources
index 4fe7901..4f92d89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (soci-4.1.0.rc3.tar.gz) = e7202ab304cfe273f7dbfa21cca6aab3925c34bda2134758655188748ec17a10e29d1b9cc143eb55a2600b23196bfc9cbbc4ebe3d6cd3f1ece8cc2db47ef0562
+SHA512 (soci-4.1.0.rc4.tar.gz) = c95efac370453c281f6107717878e63d586e82ee5e071f667e03fe81881f818c2890d2ae5ef6374c8e0f3d1a9296786047804f9e7a95581ebf1b5746fffd04f5
^ permalink raw reply related [flat|nested] 2+ messages in thread* [rpms/soci] update-to-4.1.4: Upstream upgrade
@ 2026-06-20 4:40 Denis Arnaud
0 siblings, 0 replies; 2+ messages in thread
From: Denis Arnaud @ 2026-06-20 4:40 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/soci
Branch : update-to-4.1.4
Commit : 71f3bfdc75aded0549bfa941eb684b93d1c6d370
Author : Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date : 2025-03-27T12:47:35+01:00
Stats : +68/-69 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/soci/c/71f3bfdc75aded0549bfa941eb684b93d1c6d370?branch=update-to-4.1.4
Log:
Upstream upgrade
---
diff --git a/.gitignore b/.gitignore
index 60aa700..da3218d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ soci-*.zip
soci-*.src.rpm
clog
.build-*
+/soci-*build/
/soci-?.?.?/
/soci-?.?.?-alpha*/
/soci-?.?.?-rc*/
diff --git a/soci-empty-headers.patch b/soci-empty-headers.patch
deleted file mode 100644
index e1498d5..0000000
--- a/soci-empty-headers.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/backends/empty/CMakeLists.txt b/src/backends/empty/CMakeLists.txt
-index 4a141fb8..8d6b7ece 100644
---- a/src/backends/empty/CMakeLists.txt
-+++ b/src/backends/empty/CMakeLists.txt
-@@ -21,6 +21,8 @@ soci_define_backend_target(
- "statement.cpp"
- "vector-into-type.cpp"
- "vector-use-type.cpp"
-+ HEADER_FILES
-+ "${PROJECT_SOURCE_DIR}/include/soci/empty/soci-empty.h"
- MISSING_DEPENDENCY_BEHAVIOR "${DEPENDENCY_MODE}"
- ENABLED_VARIABLE "SOCI_EMPTY"
- )
-
diff --git a/soci-unicode.patch b/soci-unicode.patch
deleted file mode 100644
index 95fe03e..0000000
--- a/soci-unicode.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/core/unicode.cpp b/src/core/unicode.cpp
---- a/src/core/unicode.cpp
-+++ b/src/core/unicode.cpp
-@@ -7,6 +7,7 @@
-
- #define SOCI_SOURCE
- #include "soci/soci-unicode.h"
-+#include <cstdint>
-
- namespace soci
- {
-
diff --git a/soci.spec b/soci.spec
index c2745a0..41be8fc 100644
--- a/soci.spec
+++ b/soci.spec
@@ -1,19 +1,19 @@
#
##
-# Default values are --with empty --with sqlite3 --with mysql --with postgresql
-# --with odbc --without oracle
+# Default values are %%{?with_empty} %%{?with_sqlite3} %%{?with_mysql}
+# %%{?with_postgresql} %%{?with_odbc} %%{!?with_oracle}
# Note that, for Oracle, when enabled, the following options should
# also be given:
# --with-oracle-include=/opt/oracle/app/oracle/product/11.1.0/db_1/rdbms/public
# --with-oracle-lib=/opt/oracle/app/oracle/product/11.1.0/db_1/lib
# If the macros are defined, redefine them with the correct compilation flags.
-%bcond_without empty
-%bcond_without sqlite3
-%bcond_without mysql
-%bcond_without postgresql
-%bcond_without odbc
-%bcond_with oracle
-%bcond_without tests
+%bcond empty 1
+%bcond sqlite3 1
+%bcond mysql 1
+%bcond postgresql 1
+%bcond odbc 1
+%bcond oracle 0
+%bcond tests 1
%global _default_oracle_dir /opt/oracle/app/oracle/product/11.1.0/db_1
%{!?_with_oracle_incdir: %define _with_oracle_incdir --with-oracle-include=%{_default_oracle_dir}/rdbms/public}
@@ -22,8 +22,8 @@
##
#
Name: soci
-Version: 4.1.0.rc1
-%global ups_ver 4.1.0-rc1
+Version: 4.1.0.rc3
+%global ups_ver 4.1.0-rc3
Release: %autorelease
Summary: The database access library for C++ programmers
License: BSL-1.0
@@ -31,9 +31,8 @@ URL: https://github.com/SOCI/%{name}
Source0: %{url}/archive/v%{ups_ver}.tar.gz#/%{name}-%{version}.tar.gz
# Works around a false positive -Wuninitialized error exposed by LTO
+# Patch submitted upstream: https://github.com/SOCI/soci/pull/1223
Patch0: soci-uninit.patch
-Patch1: soci-unicode.patch
-Patch2: soci-empty-headers.patch
BuildRequires: dos2unix
BuildRequires: gcc gcc-c++
@@ -46,6 +45,16 @@ illusion of embedding SQL in regular C++ code, staying entirely within
the C++ standard.
+%{?with_empty:%package empty
+Summary: Empty back-end for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description empty
+This package contains the Empty back-end for %{name}, i.e.,
+dynamic library specific to the Empty database. If you would like to
+use %{name} in your programs with an empty database, you will need to
+install %{name}-empty.}
+
%{?with_sqlite3:%package sqlite3
Summary: SQLite3 back-end for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -111,6 +120,17 @@ This package contains the header files, dynamic libraries and
development documentation for %{name}. If you would like to develop
programs using %{name}, you will need to install %{name}-devel.
+%{?with_empty:%package empty-devel
+Summary: Empty back-end for %{name}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-empty = %{version}-%{release}
+
+%description empty-devel
+This package contains the Empty back-end for %{name}, i.e., header
+files and dynamic libraries specific to an empty database. If you
+would like to develop programs using %{name} and an empty database,
+you will need to install %{name}-empty.}
+
%{?with_sqlite3:%package sqlite3-devel
Summary: SQLite3 back-end for %{name}
Requires: %{name}-devel = %{version}-%{release}
@@ -185,16 +205,14 @@ library. The documentation is the same as at the %{name} web page.
%prep
%setup -q -n %{name}-%{ups_ver}
%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
# Rename change-log and license file, so that they comply with
# packaging standard
mv README.md README
mv CHANGES ChangeLog
mv LICENSE_1_0.txt COPYING
-echo "2019-11-09:" > NEWS
-echo "- Version 4.0.0" >> NEWS
+echo "2025-03-27:" > NEWS
+echo "- Version 4.1.0" >> NEWS
echo "- See the ChangeLog file for more details." >> NEWS
# Remove the spurious executable permission
chmod a-x AUTHORS README ChangeLog COPYING NEWS
@@ -206,17 +224,16 @@ dos2unix AUTHORS README ChangeLog COPYING NEWS
# Support for building tests.
%define soci_testflags -DBUILD_TESTS="NONE"
%if %{with tests}
-%define soci_testflags -DSOCI_TEST=ON -DSOCI_TEST_EMPTY_CONNSTR="dummy" -DSOCI_TEST_SQLITE3_CONNSTR="test.db" -DSOCI_TEST_POSTGRESQL_CONNSTR:STRING="dbname=soci_test" -DSOCI_TEST_MYSQL_CONNSTR:STRING="db=soci_test user=mloskot password=pantera"
+%define soci_testflags -DSOCI_TEST=ON -DSOCI_EMPTY_TEST_CONNSTR="dummy" -DSOCI_SQLITE3_TEST_CONNSTR="test.db" -DSOCI_POSTGRESQL_TEST_CONNSTR:STRING="dbname=soci_test" -DSOCI_MYSQL_TEST_CONNSTR:STRING="db=soci_test user=mloskot password=pantera"
%endif
%cmake \
- -DSOCI_CXX11=ON \
- -DSOCI_EMPTY=%{?with_empty:ON}%{?without_empty:OFF} \
- -DSOCI_SQLITE3=%{?with_sqlite3:ON}%{?without_sqlite3:OFF} \
- -DSOCI_POSTGRESQL=%{?with_postgresql:ON}%{?without_postgresql:OFF} \
- -DSOCI_MYSQL=%{?with_mysql:ON}%{?without_mysql:OFF} \
- -DSOCI_ODBC=%{?with_odbc:ON}%{?without_odbc:OFF} \
- -DWITH_ORACLE=%{?with_oracle:ON %{?_with_oracle_incdir} %{?_with_oracle_libdir}}%{?without_oracle:OFF} \
+ -DSOCI_EMPTY=%{?with_empty:ON}%{!?with_empty:OFF} \
+ -DSOCI_SQLITE3=%{?with_sqlite3:ON}%{!?with_sqlite3:OFF} \
+ -DSOCI_POSTGRESQL=%{?with_postgresql:ON}%{!?with_postgresql:OFF} \
+ -DSOCI_MYSQL=%{?with_mysql:ON}%{!?with_mysql:OFF} \
+ -DSOCI_ODBC=%{?with_odbc:ON}%{!?with_odbc:OFF} \
+ -DSOCI_ORACLE=%{?with_oracle:ON %{?_with_oracle_incdir} %{?_with_oracle_libdir}}%{!?with_oracle:OFF} \
%{soci_testflags}
%cmake_build
@@ -225,7 +242,7 @@ dos2unix AUTHORS README ChangeLog COPYING NEWS
# The SOCI libraries are now released in a non-standard location
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-echo "%{_libdir}/%{name}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}64.conf
+#echo "%%{_libdir}/%%{name}" > %%{buildroot}%%{_sysconfdir}/ld.so.conf.d/%%{name}64.conf
# CMake helpers
mkdir -p %{buildroot}%{_datadir}/%{name}
@@ -242,69 +259,76 @@ rm -f %{buildroot}%{_libdir}/*.a
%files
%doc AUTHORS ChangeLog COPYING NEWS README
-%{_sysconfdir}/ld.so.conf.d/%{name}64.conf
-%{_libdir}/%{name}/lib%{name}_core.so.*
-%{?with_empty:%{_libdir}/%{name}/lib%{name}_empty.so.*}
+#%%{_sysconfdir}/ld.so.conf.d/%%{name}64.conf
+%{_libdir}/lib%{name}_core.so.*
+
+%{?with_empty:%files empty
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_libdir}/lib%{name}_empty.so.*}
%{?with_sqlite3:%files sqlite3
%doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/%{name}/lib%{name}_sqlite3.so.*}
+%{_libdir}/lib%{name}_sqlite3.so.*}
%{?with_mysql:%files mysql
%doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/%{name}/lib%{name}_mysql.so.*}
+%{_libdir}/lib%{name}_mysql.so.*}
%{?with_postgresql:%files postgresql
%doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/%{name}/lib%{name}_postgresql.so.*}
+%{_libdir}/lib%{name}_postgresql.so.*}
%{?with_odbc:%files odbc
%doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/%{name}/lib%{name}_odbc.so.*}
+%{_libdir}/lib%{name}_odbc.so.*}
%{?with_oracle:%files oracle
%doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/%{name}/lib%{name}_oracle.so.*}
+%{_libdir}/lib%{name}_oracle.so.*}
%files devel
%doc AUTHORS ChangeLog COPYING NEWS README
%dir %{_includedir}/%{name}/
%{_includedir}/%{name}/*.h
-%{?with_empty:%{_includedir}/%{name}/empty/}
-%{_libdir}/%{name}/lib%{name}_core.so
-%{?with_empty:%{_libdir}/%{name}/lib%{name}_empty.so}
+%{_libdir}/lib%{name}_core.so
%{_datadir}/%{name}/CMake
+%{?with_empty:%files empty-devel
+%doc AUTHORS ChangeLog COPYING NEWS README
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/empty/
+%{_libdir}/lib%{name}_empty.so}
+
%{?with_sqlite3:%files sqlite3-devel
%doc AUTHORS ChangeLog COPYING NEWS README
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/sqlite3/
-%{_libdir}/%{name}/lib%{name}_sqlite3.so}
+%{_libdir}/lib%{name}_sqlite3.so}
%{?with_mysql:%files mysql-devel
%doc AUTHORS ChangeLog COPYING NEWS README
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/mysql
-%{_libdir}/%{name}/lib%{name}_mysql.so}
+%{_libdir}/lib%{name}_mysql.so}
%{?with_postgresql:%files postgresql-devel
%doc AUTHORS ChangeLog COPYING NEWS README
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/postgresql
-%{_libdir}/%{name}/lib%{name}_postgresql.so}
+%{_libdir}/lib%{name}_postgresql.so}
%{?with_odbc:%files odbc-devel
%doc AUTHORS ChangeLog COPYING NEWS README
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/odbc/
-%{_libdir}/%{name}/lib%{name}_odbc.so}
+%{_libdir}/lib%{name}_odbc.so}
%{?with_oracle:%files oracle-devel
%doc AUTHORS ChangeLog COPYING NEWS README
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/oracle
-%{_libdir}/%{name}/lib%{name}_oracle.so}
+%{_libdir}/lib%{name}_oracle.so}
%files doc
diff --git a/sources b/sources
index ec83f76..4fe7901 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (soci-4.1.0.rc1.tar.gz) = 1d610661d5ebd60f712ebfa0ad78c712fbda913cee933449f7e79b6dfba2bf687d8108becb49de68a5632395bb997bb554821e3293d9e6a1f17d043089cec684
+SHA512 (soci-4.1.0.rc3.tar.gz) = e7202ab304cfe273f7dbfa21cca6aab3925c34bda2134758655188748ec17a10e29d1b9cc143eb55a2600b23196bfc9cbbc4ebe3d6cd3f1ece8cc2db47ef0562
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-06-20 4:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-20 4:40 [rpms/soci] update-to-4.1.4: Upstream upgrade Denis Arnaud
2026-06-20 4:40 Denis Arnaud
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox