summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kstreamripper
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2019-07-30 19:54:39 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2019-07-30 19:54:39 +0200
commitf6042194a160d58772626035fa59604da08e06e0 (patch)
tree598895a543568639cb582d0013891519357cdf11 /redhat/applications/kstreamripper
parent87f8fcd5f192267ad890dd4e923be245bb834658 (diff)
downloadtde-packaging-f6042194a160d58772626035fa59604da08e06e0.tar.gz
tde-packaging-f6042194a160d58772626035fa59604da08e06e0.zip
RPM: update packages to build on Fedora 30, Mageia 7
Diffstat (limited to 'redhat/applications/kstreamripper')
-rw-r--r--redhat/applications/kstreamripper/kstreamripper-14.0.0.spec11
1 files changed, 6 insertions, 5 deletions
diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index d5395491a..988dd77ac 100644
--- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
-%if 0%{?fedora} >= 28
+%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7
%global debug_package %{nil}
%endif
@@ -59,6 +59,7 @@ 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}
@@ -100,7 +101,7 @@ you with managing/ripping your preferred streams.
%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -a 1
%__rm -f kde.py
@@ -109,14 +110,14 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export QTDIR=/usr
-scons configure prefix="%{_prefix}"
-scons %{?_smp_mflags}
+python ./scons.py configure prefix="%{_prefix}"
+python ./scons.py %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-DESTDIR="%{?buildroot}" scons install
+DESTDIR="%{?buildroot}" python ./scons.py install
# Missing icon file will make this fail.
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"