From 24c06ffc5bdff8a2d02c893c0d03f5173eab5c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 30 Jan 2021 23:53:31 +0100 Subject: RPM: update build scripts for Fedora 33 / CentOS 8 --- redhat/applications/basket/basket.spec | 1 + redhat/applications/digikam/digikam.spec | 4 ++ redhat/applications/k3b/k3b.spec | 5 +- .../kcmldapcontroller/kcmldapcontroller.spec | 2 +- .../kcmldapmanager/kcmldapmanager.spec | 2 +- redhat/applications/kdiff3/kdiff3.spec | 3 +- redhat/applications/kerberostray/kerberostray.spec | 2 +- redhat/applications/kpilot/kpilot.spec | 2 + .../applications/kstreamripper/kstreamripper.spec | 67 +++++++++++++--------- redhat/applications/ktorrent/ktorrent.spec | 8 +++ redhat/applications/mathemagics/mathemagics.spec | 2 +- .../applications/qalculate-tde/qalculate-tde.spec | 9 +-- redhat/applications/tdedocker/tdedocker.spec | 5 ++ redhat/applications/tdepacman/tdepacman.spec | 2 +- redhat/applications/tdepowersave/tdepowersave.spec | 2 +- redhat/applications/tellico/tellico.spec | 3 + redhat/applications/wlassistant/wlassistant.spec | 14 +---- 17 files changed, 79 insertions(+), 54 deletions(-) (limited to 'redhat/applications') diff --git a/redhat/applications/basket/basket.spec b/redhat/applications/basket/basket.spec index 3308bfdd8..c7219b5b1 100644 --- a/redhat/applications/basket/basket.spec +++ b/redhat/applications/basket/basket.spec @@ -60,6 +60,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdepim-devel >= %{tde_version} +BuildRequires: trinity-kontact-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gpgme-devel diff --git a/redhat/applications/digikam/digikam.spec b/redhat/applications/digikam/digikam.spec index 334d52243..9e318e179 100644 --- a/redhat/applications/digikam/digikam.spec +++ b/redhat/applications/digikam/digikam.spec @@ -351,7 +351,11 @@ export PATH="%{tde_bindir}:${PATH}" --enable-rpath \ --disable-gcc-hidden-visibility \ \ +%if 0%{?rhel} == 5 + --with-included-sqlite3 +%else --without-included-sqlite3 +%endif %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/k3b/k3b.spec b/redhat/applications/k3b/k3b.spec index 271a6a160..79b024e06 100644 --- a/redhat/applications/k3b/k3b.spec +++ b/redhat/applications/k3b/k3b.spec @@ -131,7 +131,7 @@ BuildRequires: libudev-devel # HAL support %if 0%{?rhel} == 5 -%define with_hal 1 +%define with_hal 0 BuildRequires: hal-devel %endif @@ -451,6 +451,9 @@ fi -DWITH_MUSEPACK="ON" \ -DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \ -DWITH_MAD="%{!?with_libmad:OFF}%{?with_libmad:ON}" \ +%if 0%{?rhel} == 5 + -DWITH_HAL="ON" \ +%endif .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec index 9cc1ce866..6c0039e06 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec @@ -109,7 +109,7 @@ BuildRequires: libudev-devel %endif # LIBCOM_ERR support -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 BuildRequires: libcom_err-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/kcmldapmanager/kcmldapmanager.spec index 4e774e953..4414783d4 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager.spec @@ -106,7 +106,7 @@ BuildRequires: libudev-devel %endif # LIBCOM_ERR support -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 BuildRequires: libcom_err-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} diff --git a/redhat/applications/kdiff3/kdiff3.spec b/redhat/applications/kdiff3/kdiff3.spec index 2678775bd..f574cd1dd 100644 --- a/redhat/applications/kdiff3/kdiff3.spec +++ b/redhat/applications/kdiff3/kdiff3.spec @@ -153,13 +153,14 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} %find_lang %{tde_pkg}_plugin +cat "%{tde_pkg}_plugin.lang" >>"%{tde_pkg}.lang" %clean %__rm -rf %{buildroot} -%files -f %{tde_pkg}.lang -f %{tde_pkg}_plugin.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_bindir}/kdiff3 diff --git a/redhat/applications/kerberostray/kerberostray.spec b/redhat/applications/kerberostray/kerberostray.spec index 697da789e..7924f35a3 100644 --- a/redhat/applications/kerberostray/kerberostray.spec +++ b/redhat/applications/kerberostray/kerberostray.spec @@ -106,7 +106,7 @@ BuildRequires: libudev-devel %endif # LIBCOM_ERR support -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 BuildRequires: libcom_err-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} diff --git a/redhat/applications/kpilot/kpilot.spec b/redhat/applications/kpilot/kpilot.spec index b04791581..aa19d1eb4 100644 --- a/redhat/applications/kpilot/kpilot.spec +++ b/redhat/applications/kpilot/kpilot.spec @@ -96,8 +96,10 @@ BuildRequires: flex %endif %if 0%{?rhel} || 0%{?fedora} BuildRequires: flex +%if 0%{?rhel} != 5 BuildRequires: flex-devel %endif +%endif # PILOT support BuildRequires: pilot-link-devel >= 0.12 diff --git a/redhat/applications/kstreamripper/kstreamripper.spec b/redhat/applications/kstreamripper/kstreamripper.spec index e62b19867..e25b14176 100644 --- a/redhat/applications/kstreamripper/kstreamripper.spec +++ b/redhat/applications/kstreamripper/kstreamripper.spec @@ -15,10 +15,6 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # -%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8 -%global debug_package %{nil} -%endif - # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" @@ -59,7 +55,6 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: scons-local-2.5.1.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -80,19 +75,7 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -#BuildRequires: scons - -# PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 -%global python python2 -%global __python %__python2 -%global python_sitearch %{python2_sitearch} -%else -%global python python -%endif -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -BuildRequires: %{python} -BuildRequires: %{python}-devel +BuildRequires: cmake %description @@ -112,23 +95,49 @@ you with managing/ripping your preferred streams. %prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -a 1 -%__rm -f kde.py +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" - -export QTDIR=/usr -%__python ./scons.py configure prefix="%{_prefix}" -%__python ./scons.py %{?_smp_mflags} - +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_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + -DWITH_NVCONTROL=OFF \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. + +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -DESTDIR="%{?buildroot}" %__python ./scons.py install +%__make install DESTDIR=%{buildroot} -C build # Missing icon file will make this fail. echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" @@ -138,17 +147,21 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %suse_update_desktop_file kstreamripper Audio Recorder %endif +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/kstreamripper %{tde_tdeappdir}/kstreamripper.desktop %{tde_datadir}/apps/kstreamripper/ +%{tde_datadir}/icons/hicolor/*/apps/kstreamripper.png %{tde_tdedocdir}/HTML/en/kstreamripper/ +%{tde_mandir}/man*/kstreamripper.* %changelog diff --git a/redhat/applications/ktorrent/ktorrent.spec b/redhat/applications/ktorrent/ktorrent.spec index dad0315c2..9a2b241b7 100644 --- a/redhat/applications/ktorrent/ktorrent.spec +++ b/redhat/applications/ktorrent/ktorrent.spec @@ -94,6 +94,14 @@ Requires: avahi %endif %endif +# GEOIP +%if 0%{?suse_version} +%if 0%{?suse_version} < 1550 +BuildRequires: libGeoIP-devel +%endif +%else +BuildRequires: geoip-devel +%endif %description KTorrent is a BitTorrent program for Trinity. Its features include speed capping diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec index 0f4f5f825..0a03f614e 100644 --- a/redhat/applications/mathemagics/mathemagics.spec +++ b/redhat/applications/mathemagics/mathemagics.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Summary: Mathemagics is a RPN Calculator. Version: 1.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec index 4d6d4a2e6..21c581105 100644 --- a/redhat/applications/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/qalculate-tde/qalculate-tde.spec @@ -68,7 +68,7 @@ BuildRequires: libtool BuildRequires: libqalculate-devel >= 0.9.6 -%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 +%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?rhel} BuildRequires: cln-devel %endif %if 0%{?pclinuxos} >= 2018 @@ -109,9 +109,6 @@ This package contains the TDE user interface of qalculate. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Fix build on r14.0.x -%__sed -i *"/Makefile.am" -e "s|\$(LIB_TQT)|-ltqt-mt|" - %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -139,10 +136,6 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" --enable-rpath \ --disable-gcc-hidden-visibility -%if 0%{?mgaversion} >= 6 -%__sed -i "src/Makefile" -e "s|-Wl,--no-undefined||" -%endif - %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/tdedocker/tdedocker.spec index b71c0753b..55626fc87 100644 --- a/redhat/applications/tdedocker/tdedocker.spec +++ b/redhat/applications/tdedocker/tdedocker.spec @@ -170,6 +170,11 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdedocker.desktop Utility DesktopUtility +%endif + %find_lang %{tde_pkg} diff --git a/redhat/applications/tdepacman/tdepacman.spec b/redhat/applications/tdepacman/tdepacman.spec index 332b6531d..5a061b13d 100644 --- a/redhat/applications/tdepacman/tdepacman.spec +++ b/redhat/applications/tdepacman/tdepacman.spec @@ -43,7 +43,7 @@ Name: trinity-%{tde_pkg} Summary: A pacman game for the Trinity Desktop Version: 0.3.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tdepowersave/tdepowersave.spec b/redhat/applications/tdepowersave/tdepowersave.spec index 2ca6f54ab..a087b8e99 100644 --- a/redhat/applications/tdepowersave/tdepowersave.spec +++ b/redhat/applications/tdepowersave/tdepowersave.spec @@ -90,7 +90,7 @@ BuildRequires: libudev-devel %define with_xscreensaver 1 %if 0%{?rhel} == 5 BuildRequires: xorg-x11-proto-devel -BuildRequires: gnome-screensaver +#BuildRequires: gnome-screensaver %endif %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} >= 4 diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/tellico/tellico.spec index bfdafb9a8..5a4910f16 100644 --- a/redhat/applications/tellico/tellico.spec +++ b/redhat/applications/tellico/tellico.spec @@ -313,6 +313,9 @@ fi -DWITH_LIBKCAL=ON \ -DWITH_LIBBTPARSE=OFF \ -DWITH_SAX_LOADER=ON \ +%if 0%{?rhel} == 5 + -DBUILD_WEBCAM_SUPPORT=OFF \ +%endif .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/wlassistant/wlassistant.spec index 4edd549eb..968614465 100644 --- a/redhat/applications/wlassistant/wlassistant.spec +++ b/redhat/applications/wlassistant/wlassistant.spec @@ -181,28 +181,20 @@ export PATH="%{tde_bindir}:${PATH}" %suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network %endif +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc ChangeLog VERSION %{tde_bindir}/wlassistant %{tde_tdeappdir}/wlassistant.desktop %{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png %{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png -%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo -%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo -%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo -%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo -%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo -%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo -%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo -%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo -%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo -%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo %changelog -- cgit v1.2.3