2d62203f | 2018-07-16 08:11:24 | François Andriot |
RPM: update kstreamripper spec file |
||
M redhat/Makefile.r14 M redhat/applications/kstreamripper/kstreamripper-14.0.0.spec |
||
redhat/Makefile.r14diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index ac8148e..86678ef 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -623,10 +623,7 @@ $(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) redhat/applications/kstreamripper/kstreamripper-14.0.0.specdiff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec index 9af509e..58b1d9b 100644 --- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec +++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec @@ -108,21 +108,31 @@ 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 @@ -135,7 +145,6 @@ %{tde_tdeappdir}/kstreamripper.desktop %{tde_datadir}/apps/kstreamripper/ %{tde_tdedocdir}/HTML/en/kstreamripper/ - %changelog |