From 5cb7ca9378afce317fd424fe6e14fc00d53ab356 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Tue, 22 Sep 2026 06:27:40 -0300 Subject: RPM piklab: update packaging for TDE master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RPM piklab: update packaging for TDE master Consolidate the final validated packaging changes for piklab from the Tumbleweed build series. Original commits represented: 2. Signed-off-by: Sebastião Guerra --- redhat/applications/development/piklab/piklab.spec | 51 +++++----------------- 1 file changed, 12 insertions(+), 39 deletions(-) diff --git a/redhat/applications/development/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec index 6c354769d..195ed0504 100644 --- a/redhat/applications/development/piklab/piklab.spec +++ b/redhat/applications/development/piklab/piklab.spec @@ -58,10 +58,9 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -115,54 +114,28 @@ are supported. A command-line programmer and debugger are also available. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -# Warning: --enable-final causes FTBFS -# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837 -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ -%if 0%{?rhel} == 5 - --disable-libreadline \ -%endif - -%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 -touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" -%endif +%cmake \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DCMAKE_INSTALL_RPATH=%{tde_libdir} \ + -DWITH_ALL_OPTIONS=OFF \ + -DWITH_GCC_VISIBILITY=OFF \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON %__make %{?_smp_mflags} -%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 -touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" -%endif - %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Incorrect extension on manpage -%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1 +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} -- cgit v1.2.3