RPM: various fixes to build on CentOS 8

pull/92/head
François Andriot 5 years ago
parent 26d469b405
commit 18cafac14a

@ -82,7 +82,7 @@ BuildRequires: brp-check-trinity
# RHEL 4: disabled
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5

@ -1,143 +0,0 @@
#
# spec file for package kstreamripper (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7
%global debug_package %{nil}
%endif
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
%define tde_version 14.0.7
%endif
%define tde_pkg kstreamripper
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.3.4
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: TDE frontend for streamripper
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
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}
BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs} && 0%{?suse_version}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
BuildRequires: scons
BuildRequires: python
%description
KStreamRipper is a small frontend for the streamripper command
line utility. Streamripper captures internet shoutcast radio streams
on your harddisk and splits them up in mp3 files. KStreamRipper helps
you with managing/ripping your preferred streams.
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -a 1
%__rm -f kde.py
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export QTDIR=/usr
python2 /usr/bin/scons configure prefix="%{_prefix}"
python2 /usr/bin/scons %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
DESTDIR="%{?buildroot}" python ./scons.py install
# Missing icon file will make this fail.
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file kstreamripper Audio Recorder
%endif
%clean
%__rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{tde_bindir}/kstreamripper
%{tde_tdeappdir}/kstreamripper.desktop
%{tde_datadir}/apps/kstreamripper/
%{tde_tdedocdir}/HTML/en/kstreamripper/
%changelog

@ -86,7 +86,7 @@ BuildRequires: libudev-devel
# XSCREENSAVER support
# Disabled on RHEL4
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?rhel} == 5
BuildRequires: xorg-x11-proto-devel

@ -19,7 +19,7 @@
#copyright : (C) 2003 SuSE AG
#email : Uwe.Gansert@suse.de
%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7
%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8
%global debug_package %{nil}
%endif

@ -218,7 +218,7 @@ Obsoletes: trinity-tde-guidance-powermanager
#Requires: trinity-qt4-tqt-theme-engine
# On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
%if 0%{?rhel} == 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
Requires: trinity-rosegarden
%endif
@ -227,17 +227,6 @@ Requires: trinity-rosegarden
#Requires: trinity-desktop-effects-kde
#Requires: trinity-fusion-icon
# Useless l10n package
#Requires: trinity-filelight-l10n
# Not even an RPM package ...
#Requires: trinity-konstruct
# Debian/Ubuntu specific ...
#Requires: trinity-adept
#Requires: trinity-gwenview-i18n
%description applications
%{summary}
@ -246,37 +235,6 @@ Requires: trinity-rosegarden
##########
%package extras
Group: User Interface/Desktops
Summary: Meta-package to install all extras (unofficial) TDE packages
Requires: trinity-icons-crystalsvg-updated
Requires: trinity-icons-kfaenza
Requires: trinity-icons-nuvola
Requires: trinity-icons-oxygen
#Requires: trinity-kickoff-i18n
#Requires: trinity-kcheckgmail
#Requires: trinity-kdebluetooth
Requires: trinity-kdevmon
Requires: trinity-kdissert
Requires: trinity-kompose
Requires: trinity-koverartist
Requires: trinity-kpacman
Requires: trinity-mathemagics
#Requires: trinity-tdeio-sysinfo-plugin
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
Requires: trinity-klibido
%endif
%description extras
%{summary}
%files extras
##########
%package all
Group: User Interface/Desktops
Summary: Meta-package to install all TDE packages
@ -284,7 +242,6 @@ Summary: Meta-package to install all TDE packages
Requires: %{name} = %{version}
Requires: %{name}-applications = %{version}
Requires: %{name}-devel = %{version}
#Requires: %{name}-extras = %{version}
%description all
%{summary}

@ -103,7 +103,7 @@ BuildRequires: libart_lgpl-devel
# RHEL 4: disabled
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7) || 0%{?suse_version}
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5

@ -566,7 +566,7 @@ BuildRequires: OpenEXR-devel
# RHEL 5: available in centos-extras
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5

@ -335,7 +335,7 @@ BuildRequires: file-devel
BuildRequires: %{_lib}nm-util-devel
%endif
%if 0%{?rhel} >= 6 || 0%{?fedora}
%if 0%{?fedora} >= 29
%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
BuildRequires: NetworkManager-libnm-devel
%else
BuildRequires: NetworkManager-glib-devel

@ -144,7 +144,7 @@ BuildRequires: libXcomposite-devel
# RHEL 4: disabled
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5

@ -81,9 +81,19 @@ BuildRequires: fdupes
BuildRequires: gettext
BuildRequires: net-snmp-devel
BuildRequires: python-devel
BuildRequires: gmp-devel
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
%define python python2
%define __python %__python2
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%else
%define python python
%endif
BuildRequires: %{python}
BuildRequires: %{python}-devel
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
@ -135,7 +145,7 @@ BuildRequires: pcre-devel
BuildRequires: libacl-devel
# XSCREENSAVER support
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
BuildRequires: libXScrnSaver-devel

Loading…
Cancel
Save