From e1cb8bdf49e4c00dfd3a5e867091a3b973aad0c0 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Tue, 22 Sep 2026 06:25:11 -0300 Subject: RPM kbarcode: update packaging for TDE master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RPM kbarcode: update packaging for TDE master Consolidate the final validated packaging changes for kbarcode from the Tumbleweed build series. Original commits represented: 1. Signed-off-by: Sebastião Guerra --- redhat/applications/utilities/kbarcode/kbarcode.spec | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/redhat/applications/utilities/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec index 6164dc971..38b296251 100644 --- a/redhat/applications/utilities/kbarcode/kbarcode.spec +++ b/redhat/applications/utilities/kbarcode/kbarcode.spec @@ -86,7 +86,7 @@ BuildRequires: openssl-devel %endif # PCRE support -BuildRequires: pcre-devel +BuildRequires: pcre2-devel # SUSE desktop files utility %if 0%{?suse_version} @@ -171,11 +171,6 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then - %__mkdir_p build - cd build -fi - %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ @@ -197,8 +192,7 @@ fi \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON \ - .. + -DBUILD_TRANSLATIONS=ON %__make %{?_smp_mflags} || %__make -- cgit v1.2.3