summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2018-07-16 15:11:24 +0200
committerFran├žois Andriot <albator78@libertysurf.fr>2018-07-16 15:11:24 +0200
commit2d62203f9930d28c9ac2a362de5d7dbb36d93190 (patch)
tree96efe99cdc589084ffdb0ec87fd08ea108e09b64 /redhat
parent2f28732a425cc806d18726b6801ccfe593ddc280 (diff)
downloadtde-packaging-2d62203f9930d28c9ac2a362de5d7dbb36d93190.tar.gz
tde-packaging-2d62203f9930d28c9ac2a362de5d7dbb36d93190.zip
RPM: update kstreamripper spec file
Diffstat (limited to 'redhat')
-rw-r--r--redhat/Makefile.r143
-rw-r--r--redhat/applications/kstreamripper/kstreamripper-14.0.0.spec23
2 files changed, 16 insertions, 10 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index ac8148e4f..86678efa7 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -623,10 +623,7 @@ ksquirrel: tdebase libkipi libksquirrel
$(call buildpkg,applications/ksquirrel)
kstreamripper: tdebase
-# Do NOT build on Fedora 27, OpenSUSE >= 15.0 (problem with scons and python3)
-ifeq (,$(filter $(DIST),.fc27 .oss150 .osstw))
$(call buildpkg,applications/kstreamripper)
-endif
ksystemlog: tdebase
$(call buildpkg,applications/ksystemlog)
diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index 9af509ede..58b1d9be9 100644
--- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
@@ -108,22 +108,32 @@ you with managing/ripping your preferred streams.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+# Force running 'tmoc' on all header files
+for h in "src/"*".h"; do
+ moc="${h/.h/.moc}"
+ tmoc "${h}" -o "${moc}"
+ cpp="${h/.h/.cpp}"
+ echo "#include \"${moc##*/}\"" >>"${cpp}"
+done
+
export QTDIR=/usr
-scons -Q -j4
+python2 /usr/bin/scons configure prefix="%{_prefix}"
+python2 /usr/bin/scons %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Move desktop file to XDG folder
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+DESTDIR="%{?buildroot}" python2 /usr/bin/scons 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}
@@ -137,5 +147,4 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%{tde_tdedocdir}/HTML/en/kstreamripper/
-
%changelog