RPM: updates (cherry-pick from TDE R14.0.13)

Signed-off-by: François Andriot <albator78@libertysurf.fr>

1 files changed, 35 insertions, 34 deletions

diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/tderadio/tderadio.spec
index 47ef2c7ca..d7d3b7315 100644
--- a/redhat/applications/tderadio/tderadio.spec
+++ b/redhat/applications/tderadio/tderadio.spec
@@ -65,7 +65,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -147,45 +147,36 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__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"
-
 
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-visibility causes applications fails to start !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --program-prefix="" \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \
-  --enable-v4l2 \
-  --enable-lame \
-  --enable-ogg \
-  --enable-alsa \
-  --enable-oss
-
-%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
-%__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||"
-%endif
+  -DBUILD_ALL=ON \
+  ..
 
 %__make %{?_smp_mflags}
 
@@ -193,7 +184,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
@@ -202,6 +193,10 @@ export PATH="%{tde_bindir}:${PATH}"
 %suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner
 %endif
 
+# Remove devel files
+%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.la
+%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.so
+
 
 %clean
 %__rm -rf %{buildroot}
@@ -211,6 +206,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %defattr(-,root,root,-)
 %{tde_bindir}/convert-presets
 %{tde_bindir}/tderadio
+%{tde_libdir}/libtderadio.so.0
+%{tde_libdir}/libtderadio.so.0.0.0
 %dir %{tde_libdir}/tderadio
 %dir %{tde_libdir}/tderadio/plugins
 %{tde_libdir}/tderadio/plugins/*.la
@@ -221,10 +218,14 @@ export PATH="%{tde_bindir}:${PATH}"
 %dir %{tde_datadir}/icons/hicolor/256x256/actions
 %{tde_datadir}/icons/hicolor/*/*/tderadio*.png
 %{tde_datadir}/icons/locolor/*/*/tderadio*.png
+%{tde_datadir}/pixmaps/tderadio.xpm
 %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
 %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
 %lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
 %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
 %{tde_tdedocdir}/HTML/en/tderadio/
+%{tde_mandir}/man1/convert-presets.1*
+%{tde_mandir}/man1/tderadio.1*
+
 
 %changelog