From 93ff54308967154e48a8331626fd04900ccb75b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 31 Jan 2021 21:11:44 +0100 Subject: [PATCH] RPM: more updates --- redhat/applications/basket/basket.spec | 51 +++++++++-------- redhat/applications/bibletime/bibletime.spec | 2 +- redhat/applications/kgtk-qt3/kgtk-qt3.spec | 3 + redhat/applications/tderadio/tderadio.spec | 1 + .../dependencies/python-tqt/python-tqt.spec | 1 + redhat/dependencies/tqca-tls/tqca-tls.spec | 23 ++++++-- .../tqtinterface/tqtinterface.spec | 4 +- redhat/docker/el8/Dockerfile.x86_64 | 51 ++--------------- redhat/docker/el8/packages | 12 ++++ redhat/docker/el8/rpmmacros | 2 + redhat/docker/f33/packages | 1 + redhat/docker/f33/rpmmacros | 2 + redhat/docker/mga7/rpmmacros | 2 + redhat/main/tdebase/tdebase.spec | 2 - redhat/main/tdegames/tdegames.spec | 55 +++++++++++++++++++ redhat/main/tdenetwork/tdenetwork.spec | 4 +- redhat/main/tdeutils/tdeutils.spec | 2 +- 17 files changed, 137 insertions(+), 81 deletions(-) diff --git a/redhat/applications/basket/basket.spec b/redhat/applications/basket/basket.spec index c7219b5b1..e2c7f611a 100644 --- a/redhat/applications/basket/basket.spec +++ b/redhat/applications/basket/basket.spec @@ -65,7 +65,7 @@ BuildRequires: trinity-kontact-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gpgme-devel -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -101,32 +101,35 @@ baskets to HTML. %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/"*"/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}" -export kde_confdir="%{tde_confdir}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS="ON" \ + .. %__make %{?_smp_mflags} || %__make @@ -134,7 +137,7 @@ export kde_confdir="%{tde_confdir}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -181,9 +184,9 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %{tde_datadir}/services/basket_part.desktop %{tde_datadir}/services/basketthumbcreator.desktop %{tde_datadir}/services/kontact/basket.desktop -%{tde_datadir}/services/kontact/basket_v4.desktop %{tde_tdedocdir}/HTML/en/basket/ %config(noreplace) %{tde_confdir}/magic/basket.magic.mgc +%{tde_mandir}/man1/basket.* %changelog diff --git a/redhat/applications/bibletime/bibletime.spec b/redhat/applications/bibletime/bibletime.spec index 8e478291e..c33a47113 100644 --- a/redhat/applications/bibletime/bibletime.spec +++ b/redhat/applications/bibletime/bibletime.spec @@ -124,7 +124,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -%if 0%{?fedora} >= 31 +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8 CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11" %endif diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec index 6abcc57df..b255ec536 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec +++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec @@ -180,8 +180,11 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload" %{tde_bindir}/kgtk-wrapper %{tde_bindir}/kgtk2-wrapper %{tde_bindir}/kqt3-wrapper +%dir %{tde_datadir}/kgtk +%dir %{tde_libdir}/kgtk %{tde_libdir}/kgtk/libkgtk2.so %{tde_libdir}/kgtk/libkqt3.so %{tde_datadir}/kgtk/preload + %changelog diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/tderadio/tderadio.spec index edca31800..27d4ef6b2 100644 --- a/redhat/applications/tderadio/tderadio.spec +++ b/redhat/applications/tderadio/tderadio.spec @@ -223,6 +223,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/locolor/*/*/tderadio*.png %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %{tde_tdedocdir}/HTML/en/tderadio/ diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/python-tqt/python-tqt.spec index 374081de4..2f57100bb 100644 --- a/redhat/dependencies/python-tqt/python-tqt.spec +++ b/redhat/dependencies/python-tqt/python-tqt.spec @@ -245,6 +245,7 @@ cp -rf ../pyuic3 ../pylupdate3 echo yes | %__python ../configure.py \ -c -n %{_includedir}/tqscintilla \ + -g %{_includedir}/tqt3 \ -q %{_datadir}/tqt3 \ -y tqt-mt \ -o %{_libdir} -u -j 10 \ diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index 1ece07861..639f8ef9e 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls.spec @@ -57,6 +57,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: libtqca-devel >= %{tde_epoch}:1.0 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: openssl-devel >= 0.9.8 @@ -100,15 +101,29 @@ contains the TLS plugin. %build unset QTDIR QTINC QTLIB -./configure \ - --tqtdir=%{_prefix} +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi -%__make %{?_smp_mflags} +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DWITH_ALL_OPTIONS="ON" \ + \ + .. + +%__make %{?_smp_mflags} || %__make %install %__rm -rf %{?buildroot} -%__make install INSTALL_ROOT=%{?buildroot} +%__make install DESTDIR="%{?buildroot}" -C build %clean diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index e4253ac40..682250423 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -234,8 +234,8 @@ fi %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index f317effb7..4f5a7acdd 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -20,7 +20,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ && dnf -y install epel-release \ && dnf -y install https://download1.rpmfusion.org/free/el/updates/8/x86_64/r/rpmfusion-free-release-8-0.1.noarch.rpm \ && dnf -y install dnf-plugins-core \ - && dnf config-manager --enable PowerTools \ + && dnf config-manager --enable powertools \ && dnf -y --enableplugin=ovl install $(