public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/libdnf-plugin-txnupd] f43: Update to 0.3.0
@ 2026-05-31 18:47 Neal Gompa
  0 siblings, 0 replies; only message in thread
From: Neal Gompa @ 2026-05-31 18:47 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/libdnf-plugin-txnupd
Branch : f43
Commit : a356be7b7f1d60fa15082f69f09d1a7a2f3d2bde
Author : Neal Gompa <ngompa@fedoraproject.org>
Date   : 2026-05-31T14:46:38-04:00
Stats  : +79/-34 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/libdnf-plugin-txnupd/c/a356be7b7f1d60fa15082f69f09d1a7a2f3d2bde?branch=f43

Log:
Update to 0.3.0

---
diff --git a/.gitignore b/.gitignore
index f9c85d9..61bed3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /libdnf-plugin-txnupd-0.1.2.tar.gz
 /libdnf-plugin-txnupd-0.1.3.tar.gz
 /libdnf-plugin-txnupd-0.2.0.tar.gz
+/libdnf-plugin-txnupd-0.3.0.tar.gz

diff --git a/libdnf-plugin-txnupd-Downgrade-dnf5-dependency.patch b/libdnf-plugin-txnupd-Downgrade-dnf5-dependency.patch
index 72e9f7a..058623e 100644
--- a/libdnf-plugin-txnupd-Downgrade-dnf5-dependency.patch
+++ b/libdnf-plugin-txnupd-Downgrade-dnf5-dependency.patch
@@ -1,36 +1,35 @@
-From 9ea4b562d5be69ade2e2e6c3ae24d82991ed0072 Mon Sep 17 00:00:00 2001
+From 2150395c954b075c669d85267102b74272a08008 Mon Sep 17 00:00:00 2001
 From: Neal Gompa <ngompa@fedoraproject.org>
-Date: Sun, 22 Feb 2026 16:29:19 -0500
+Date: Sun, 31 May 2026 14:44:13 -0400
 Subject: [PATCH] Downgrade dnf5 dependency to 5.2.17.0
 
 This makes it compatible with older releases still shipping the
 plugin configuration in /etc.
 ---
- meson.build | 4 ++--
+ CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/meson.build b/meson.build
-index ee5dfb8..4f5b2cd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -29,7 +29,7 @@ foreach cppflag : test_cppflags
- endforeach
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0bbd592..1f799db 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,14 +33,14 @@ add_link_options(-Wl,--as-needed)
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
  
- libdnf_plugin_libdir = join_paths(get_option('prefix'), get_option('libdir'), 'libdnf5', 'plugins')
--libdnf_plugin_confdir = join_paths(get_option('prefix'), get_option('datadir'), 'dnf5', 'libdnf.plugins.conf.d')
-+libdnf_plugin_confdir = join_paths(get_option('prefix'), get_option('sysconfdir'), 'dnf', 'libdnf5-plugins')
+ find_package(PkgConfig REQUIRED)
+-pkg_check_modules(LIBDNF5     REQUIRED IMPORTED_TARGET libdnf5>=5.4.0.0)
++pkg_check_modules(LIBDNF5     REQUIRED IMPORTED_TARGET libdnf5>=5.2.17.0)
+ pkg_check_modules(LIBDNF5_CLI REQUIRED IMPORTED_TARGET libdnf5-cli)
+ pkg_check_modules(TUKIT       REQUIRED IMPORTED_TARGET tukit>=3.6.2)
+ find_library(DNF5_LIB NAMES dnf5 REQUIRED)
  
- libdnf_plugin_version = meson.project_version().split('.')
+ include(GNUInstallDirs)
+ set(LIBDNF_PLUGIN_LIBDIR  "${CMAKE_INSTALL_LIBDIR}/libdnf5/plugins")
+-set(LIBDNF_PLUGIN_CONFDIR "${CMAKE_INSTALL_DATADIR}/dnf5/libdnf.plugins.conf.d")
++set(LIBDNF_PLUGIN_CONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dnf/libdnf5-plugins")
+ set(DNF5_PLUGIN_LIBDIR    "${CMAKE_INSTALL_LIBDIR}/dnf5/plugins")
  
-@@ -40,7 +40,7 @@ add_project_arguments(
-     language : 'cpp',
- )
- 
--libdnf = dependency('libdnf5', version : '>=5.4.0.0')
-+libdnf = dependency('libdnf5', version : '>=5.2.17.0')
- tukit = dependency('tukit', version : '>=3.6.2')
- 
- libdnf_plugin_src = files(
+ add_compile_definitions(
 -- 
-2.53.0
+2.54.0
 

diff --git a/libdnf-plugin-txnupd.spec b/libdnf-plugin-txnupd.spec
index 3ad01e5..1228280 100644
--- a/libdnf-plugin-txnupd.spec
+++ b/libdnf-plugin-txnupd.spec
@@ -1,9 +1,11 @@
+%bcond new_dnf5 %[0%{?fedora} >= 44 || 0%{?rhel} >= 11]
+
 # Minimum compatible version
-%global libdnf5_minver 5.2.17.0
-%global tukit_minver 3.6.2
+%define libdnf5_minver %[%{with new_dnf5} ? "5.4.0.0" : "5.2.17.0"]
+%define tukit_minver 3.6.2
 
 Name:           libdnf-plugin-txnupd
-Version:        0.2.0
+Version:        0.3.0
 Release:        1%{?dist}
 Summary:        libdnf5 plugin to implement transactional updates
 
@@ -12,18 +14,39 @@ URL:            https://gitlab.com/VelocityLimitless/Projects/libdnf-plugin-txnu
 Source:         %{url}/-/archive/%{version}/%{name}-%{version}.tar.gz
 
 # Temporary until all supported releases have DNF 5.4+
-Patch1001:      libdnf-plugin-txnupd-Downgrade-dnf5-dependency.patch
+Patch10001:     libdnf-plugin-txnupd-Downgrade-dnf5-dependency.patch
 
-BuildRequires:  meson
+BuildRequires:  cmake
 BuildRequires:  gcc-c++
+BuildRequires:  dnf5-devel >= %{libdnf5_minver}
 BuildRequires:  pkgconfig(libdnf5) >= %{libdnf5_minver}
+BuildRequires:  pkgconfig(libdnf5-cli) >= %{libdnf5_minver}
 BuildRequires:  pkgconfig(tukit) >= %{tukit_minver}
+BuildRequires:  scdoc
 
 %description
 This package contains the plugin to implement transactional updates
 as a libdnf5 plugin. This plugin hooks into libdnf5 for DNF and
 PackageKit to enable this functionality in normal use.
 
+
+%package -n dnf5-plugin-txnupd
+Summary:        dnf5 plugin to implement transactional updates
+
+# Indicate providing dnf5 command
+Provides:       dnf5-command(txnupd)
+
+# Require correct minimum version of the CLI
+Requires:       dnf5%{?_isa} >= %{libdnf5_minver}
+
+# Require the core plugin
+Requires:       libdnf5-plugin-txnupd%{?_isa} = %{version}-%{release}
+
+%description -n dnf5-plugin-txnupd
+This package contains the plugin to implement transactional updates
+as a dnf5 plugin. This plugin hooks into dnf5 to expose actions in the CLI.
+
+
 %package -n libdnf5-plugin-txnupd
 Summary:        libdnf5 plugin to implement transactional updates
 
@@ -53,35 +76,57 @@ This package contains the plugin to implement transactional updates
 as a libdnf5 plugin. This plugin hooks into libdnf5 for DNF5 and
 PackageKit to enable this functionality in normal use.
 
+
 %prep
-%autosetup -p1
+%autosetup -N
+%autopatch -M 10000
+
+%if ! %{with new_dnf5}
+# patch for compatibility for dnf5 < 5.4
+%patch -P 10001 -p1
+%endif
 
 
 %conf
-%meson
+%cmake
 
 
 %build
-%meson_build
+%cmake_build
 
 
 %install
-%meson_install
+%cmake_install
 
 # Add configuration to mark this package as protected by libdnf
 mkdir -p %{buildroot}%{_sysconfdir}/dnf/protected.d
 echo "libdnf5-plugin-txnupd" > %{buildroot}%{_sysconfdir}/dnf/protected.d/txnupd.conf
 
 
+%files -n dnf5-plugin-txnupd
+%license LICENSE
+%doc README.md
+%{_libdir}/dnf5/plugins/txnupd.so
+%{_mandir}/man8/dnf5-txnupd.8*
+
+
 %files -n libdnf5-plugin-txnupd
 %license LICENSE
 %doc README.md
 %{_libdir}/libdnf5/plugins/txnupd.so
-%{_sysconfdir}/dnf/protected.d/txnupd.conf
+%if ! %{with new_dnf5}
 %{_sysconfdir}/dnf/libdnf5-plugins/txnupd.conf
+%else
+%{_datadir}/dnf5/libdnf.plugins.conf.d/txnupd.conf
+%endif
+%{_sysconfdir}/dnf/protected.d/txnupd.conf
+%{_mandir}/man5/dnf5-txnupd.conf.5*
 
 
 %changelog
+* Sun May 31 2026 Neal Gompa <ngompa@fedoraproject.org> - 0.3.0-1
+- Update to 0.3.0
+
 * Sun Feb 22 2026 Neal Gompa <ngompa@fedoraproject.org> - 0.2.0-1
 - Rebase to 0.2.0 to port to libdnf5
 

diff --git a/sources b/sources
index abb3bd4..79c8f8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libdnf-plugin-txnupd-0.2.0.tar.gz) = 335eb9a563c9dde596ca9783bc61f015013afc6a01b2c93b7f3c4ce7d898e3dc02323d8f4444199ae40fe265d02bc22580974aba05525da7391fd0cdeece9861
+SHA512 (libdnf-plugin-txnupd-0.3.0.tar.gz) = 4159a4316f16b28f2fcb30df3e2b309adafac5523c36578261035b7a735d025adab9bf03f912def118ea9b5b968df95d5bb62e4bbbd640b89f5c55487dbba501

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-05-31 18:47 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-31 18:47 [rpms/libdnf-plugin-txnupd] f43: Update to 0.3.0 Neal Gompa

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox