commit b57728214db762dcd51946fb19b85f9b93f4de4d
parent 22cc016afa51d56bbf92bde9f584cd6577d11346
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Thu, 18 May 2023 13:35:43 +0200
update change log, 0.19.2-2 fedora
Diffstat:
1 file changed, 48 insertions(+), 22 deletions(-)
diff --git a/rpmbuild/SPECS/gnunet.spec b/rpmbuild/SPECS/gnunet.spec
@@ -3,7 +3,7 @@
Name: gnunet
Version: 0.19.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Framework for secure peer-to-peer networking
License: AGPL-3.0-or-later
Group: Productivity/Networking/File-Sharing
@@ -107,8 +107,15 @@ Summary: GNUnet development headers
Files needed to develop GNUnet applications and services.
# gnunet-postgresql-plugins
-%package postgresql-plugins
+%package -n libgnunetpq
BuildRequires: libpq-devel
+Recommends: postgresql-server
+Summary: The GNUnet PostgreSQL library
+%description -n libgnunetpq
+The GNUnet PostgreSQL utility library.
+
+# gnunet-postgresql-plugins
+%package postgresql-plugins
Requires: %{name}%{?_isa} = %{version}-%{release}
Recommends: postgresql-server
Summary: The GNUnet PostgreSQL plugins
@@ -116,12 +123,11 @@ Summary: The GNUnet PostgreSQL plugins
The GNUnet PostgreSQL plugins for the datacache, datastore, namecache
and namestore components.
-%package postgresql-plugins-devel
-Requires: gnunet-postgresql-plugins%{?_isa} = %{version}-%{release}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Summary: The GNUnet PostgreSQL plugins development files
-%description postgresql-plugins-devel
+%package -n libgnunetpq-devel
+Requires: libgnunet-devel%{?_isa} = %{version}-%{release}
+Requires: libgnunetpq%{?_isa} = %{version}-%{release}
+Summary: The GNUnet PostgreSQL development files
+%description -n libgnunetpq-devel
The GNUnet PostgreSQL plugins development files.
@@ -147,8 +153,18 @@ Summary: The GNUnet CONVERSATION VoP2P component development files
%description conversation-devel
The GNUnet CONVERSATION VoP2P component development files.
+# The mysql lib
+%package -n libgnunetmy
+Requires: lib%{name}%{?_isa} = %{version}-%{release}
+BuildRequires: mariadb-devel
+Recommends: mariadb-server
+Summary: The GNUnet MySQL/MariaDB utility library
+%description -n libgnunetmy
+The GNUnet MySQL/MariaDB utility library.
+
# The mysql plugins
%package mysql-plugins
+Requires: libgnunetmy%{?_isa} = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
BuildRequires: mariadb-devel
Recommends: mariadb-server
@@ -157,13 +173,12 @@ Summary: The GNUnet MySQL/MariaDB plugins
The GNUnet MySQL/MariaDB plugins for the datacache, datastore, namecache
and namestore components.
-%package mysql-plugins-devel
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-Requires: %{name}-mysql-plugins%{?_isa} = %{version}-%{release}
-Summary: The GNUnet MySQL/MariaDB plugins development files
-%description mysql-plugins-devel
-The GNUnet MySQL/MariaDB plugins development files.
+%package -n libgnunetmy-devel
+Requires: libgnunet-devel%{?_isa} = %{version}-%{release}
+Requires: libgnunetmy%{?_isa} = %{version}-%{release}
+Summary: The GNUnet MySQL/MariaDB utility library development files
+%description -n libgnunetmy-devel
+The GNUnet MySQL/MariaDB utility library development files.
%prep
@@ -836,26 +851,31 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
%{_libdir}/pkgconfig/gnunetvpn.pc
%{_libdir}/pkgconfig/gnunetscalarproduct.pc
-%files postgresql-plugins
+%files -n libgnunetpq
%{_libdir}/libgnunetpq.so.3
%{_libdir}/libgnunetpq.so.3.0.0
+
+%files -n libgnunetpq-devel
+
+%{_libdir}/libgnunetpq.so
+%{_includedir}/%{name}/gnunet_pq_lib.h
+
+%files postgresql-plugins
%{_libdir}/%{name}/libgnunet_plugin_datacache_postgres.so
%{_libdir}/%{name}/libgnunet_plugin_datastore_postgres.so
%{_libdir}/%{name}/libgnunet_plugin_namecache_postgres.so
%{_libdir}/%{name}/libgnunet_plugin_namestore_postgres.so
-%files postgresql-plugins-devel
-%{_libdir}/libgnunetpq.so
-%{_includedir}/%{name}/gnunet_pq_lib.h
-
-%files mysql-plugins
+%files -n libgnunetmy
%{_libdir}/libgnunetmy.so.0
%{_libdir}/libgnunetmy.so.0.0.0
%{_libdir}/libgnunetmysql.so.0
%{_libdir}/libgnunetmysql.so.0.0.0
+
+%files mysql-plugins
%{_libdir}/%{name}/libgnunet_plugin_datastore_mysql.so
-%files mysql-plugins-devel
+%files -n libgnunetmy-devel
%{_libdir}/libgnunetmy.so
%{_libdir}/libgnunetmysql.so
%{_libdir}/pkgconfig/gnunetmysql.pc
@@ -912,6 +932,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
%changelog
+* Thu May 18 2023 Martin Schanzenbach <schanzen@gnunet.org> - 0.19.4-2
+- Separate out postgres/mysql utility libraries in preparation for Taler packages.
+
+* Mon May 15 2023 Martin Schanzenbach <schanzen@gnunet.org> - 0.19.4-1
+- Version bump
+
* Sun Jan 08 2023 Martin Schanzenbach <schanzen@gnunet.org> - 0.19.2-1
- Version bump
