RPM: update spec files for R14.0.10

Signed-off-by: François Andriot <albator78@libertysurf.fr>
pull/92/head
François Andriot 4 years ago
parent 32216f7353
commit 7fbd0551c3

@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -215,6 +215,7 @@ Konqueror plugin, OSD and much more.
%{tde_datadir}/mimelnk/*/*.desktop %{tde_datadir}/mimelnk/*/*.desktop
%{tde_datadir}/service*/*.desktop %{tde_datadir}/service*/*.desktop
%{tde_tdedocdir}/HTML/en/kaffeine/ %{tde_tdedocdir}/HTML/en/kaffeine/
%{tde_mandir}/man1/kaffeine.1*
########## ##########
@ -260,39 +261,34 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %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 %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%configure \ if ! rpm -E %%cmake|grep -q "cd build"; then
--prefix=%{tde_prefix} \ %__mkdir_p build
--exec-prefix=%{tde_prefix} \ cd build
--bindir=%{tde_bindir} \ fi
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--mandir=%{tde_mandir} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\ \
--disable-dependency-tracking \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
--disable-debug \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
--enable-new-ldflags \ -DLIB_INSTALL_DIR=%{tde_libdir} \
--enable-final \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility \
\ \
--with-xinerama \ -DWITH_ALL_OPTIONS=ON \
--with-gstreamer \ %{?!with_lame:-DWITH_LAME=OFF} \
--with-lame \ -DBUILD_ALL=ON \
%if 0%{?rhel} > 0 && 0%{?rhel} <= 5 ..
--without-dvb \
%endif
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
@ -300,7 +296,7 @@ export PATH="%{tde_bindir}:${PATH}"
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf $RPM_BUILD_ROOT %__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT %__make install DESTDIR=%{buildroot} -C build
## File lists ## File lists
# locale's # locale's

@ -62,7 +62,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -139,6 +139,16 @@ BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-glib-devel BuildRequires: dbus-glib-devel
%endif %endif
# NSPR support
%if 0%{?suse_version}
BuildRequires: mozilla-nspr-devel
%else
BuildRequires: nspr-devel
%endif
# Koffice support
BuildRequires: trinity-koffice-devel
Requires: %{name}-base = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
@ -164,11 +174,17 @@ KMPlayer can:
%{tde_bindir}/kmplayer %{tde_bindir}/kmplayer
%{tde_bindir}/knpplayer %{tde_bindir}/knpplayer
%{tde_bindir}/kxvplayer %{tde_bindir}/kxvplayer
%{tde_datadir}/services/kmplayer_koffice.desktop
%{tde_libdir}/libkmplayercommon.so.1
%{tde_libdir}/libkmplayercommon.so.1.0.0
%{tde_libdir}/libtdeinit_kmplayer.la %{tde_libdir}/libtdeinit_kmplayer.la
%{tde_libdir}/libtdeinit_kmplayer.so %{tde_libdir}/libtdeinit_kmplayer.so
%{tde_tdelibdir}/kmplayer.la %{tde_tdelibdir}/kmplayer.la
%{tde_tdelibdir}/kmplayer.so %{tde_tdelibdir}/kmplayer.so
%{tde_tdelibdir}/libkmplayerkofficepart.la
%{tde_tdelibdir}/libkmplayerkofficepart.so
%{tde_tdeappdir}/kmplayer.desktop %{tde_tdeappdir}/kmplayer.desktop
%exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml %exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml
%exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc %exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
%exclude %{tde_datadir}/apps/kmplayer/noise.gif %exclude %{tde_datadir}/apps/kmplayer/noise.gif
@ -190,13 +206,15 @@ Core files needed for KMPlayer.
%{tde_libdir}/libkmplayercommon.so %{tde_libdir}/libkmplayercommon.so
%{tde_bindir}/kgstplayer %{tde_bindir}/kgstplayer
%{tde_bindir}/kxineplayer %{tde_bindir}/kxineplayer
%config(noreplace) %{tde_confdir}/kmplayerrc %dir %{tde_datadir}/config
%config(noreplace) %{tde_datadir}/config/kmplayerrc
%{tde_datadir}/apps/kmplayer/bookmarks.xml %{tde_datadir}/apps/kmplayer/bookmarks.xml
%{tde_datadir}/apps/kmplayer/noise.gif %{tde_datadir}/apps/kmplayer/noise.gif
%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png %{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz %{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
%{tde_datadir}/mimelnk/application/x-kmplayer.desktop %{tde_datadir}/mimelnk/application/x-kmplayer.desktop
%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop %{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
%{tde_mandir}/man1/kmplayer.1*
########## ##########
@ -245,33 +263,34 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %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 %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
export kde_confdir="%{tde_confdir}"
if ! rpm -E %%cmake|grep -q "cd build"; then
%configure \ %__mkdir_p build
--prefix=%{tde_prefix} \ cd build
--exec-prefix=%{tde_prefix} \ fi
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--libdir=%{tde_libdir} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
--mandir=%{tde_mandir} \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\ \
--disable-dependency-tracking \ -DWITH_ALL_OPTIONS=ON \
--disable-debug \ -DBUILD_ALL=ON \
--enable-new-ldflags \ ..
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make
@ -279,7 +298,7 @@ export kde_confdir="%{tde_confdir}"
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}

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

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

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

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

@ -138,8 +138,8 @@ BuildRequires: db4-devel
#%endif #%endif
# PYTHON2 support # PYTHON2 support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
%global python %python2 %global python python2
%global __python %__python2 %global __python %__python2
%endif %endif

@ -103,7 +103,8 @@ BuildRequires: libart_lgpl-devel
# RHEL 4: disabled # RHEL 4: disabled
# RHEL 6: available in EPEL # RHEL 6: available in EPEL
# RHEL 7: available in NUX # RHEL 7: available in NUX
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} # RHEL 8: available in EPEL
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1 %define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5 %if 0%{?fedora} || 0%{?rhel} >= 5
@ -732,8 +733,11 @@ fi
\ \
%{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \ %{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
%{!?with_libart}:-DWITH_LIBART=OFF} \ %{!?with_libart}:-DWITH_LIBART=OFF} \
-DWITH_OPENGL=ON \ -DWITH_ALL_OPTIONS=ON \
-DWITH_ARTS=ON \ -DWITH_ARTS=ON \
-DWITH_LIBART=ON \
-DWITH_OPENGL=ON \
-DWITH_XSCREENSAVER=ON \
-DBUILD_ALL=ON \ -DBUILD_ALL=ON \
.. ..

@ -352,6 +352,13 @@ Requires: mageia-theme-Default
%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg %define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
%endif %endif
# Mageia 8 Theme
%if 0%{?mgaversion} == 8
Requires: mageia-theme-Default
%define tde_bg /usr/share/mga/backgrounds/default.jpg
%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
%endif
# Mandriva 2011 Theme: "rosa" # Mandriva 2011 Theme: "rosa"
%if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100" %if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
Requires: mandriva-theme Requires: mandriva-theme
@ -590,7 +597,8 @@ BuildRequires: OpenEXR-devel
# RHEL 5: available in centos-extras # RHEL 5: available in centos-extras
# RHEL 6: available in EPEL # RHEL 6: available in EPEL
# RHEL 7: available in NUX # RHEL 7: available in NUX
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} # RHEL 8: available in EPEL
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1 %define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5 %if 0%{?fedora} || 0%{?rhel} >= 5
@ -2588,7 +2596,6 @@ functionality.
%{tde_datadir}/icons/crystalsvg/*/apps/kicker.png %{tde_datadir}/icons/crystalsvg/*/apps/kicker.png
%{tde_datadir}/icons/crystalsvg/*/apps/panel.png %{tde_datadir}/icons/crystalsvg/*/apps/panel.png
%{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png %{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png
%{tde_datadir}/icons/crystalsvg/*/apps/window_list.png
%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz %{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz
%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz %{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz
%{tde_datadir}/servicetypes/kickoffsearchplugin.desktop %{tde_datadir}/servicetypes/kickoffsearchplugin.desktop

@ -169,7 +169,7 @@ BuildRequires: Mesa-libGLU-devel
%endif %endif
# PYTHON support # PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
%global python python2 %global python python2
%global __python %__python2 %global __python %__python2
%global python_sitearch %{python2_sitearch} %global python_sitearch %{python2_sitearch}

@ -148,7 +148,8 @@ BuildRequires: libXcomposite-devel
# RHEL 4: disabled # RHEL 4: disabled
# RHEL 6: available in EPEL # RHEL 6: available in EPEL
# RHEL 7: available in NUX # RHEL 7: available in NUX
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} # RHEL 8: available in EPEL
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1 %define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5 %if 0%{?fedora} || 0%{?rhel} >= 5
@ -1480,7 +1481,6 @@ library.
%files -n trinity-libtdepim-devel %files -n trinity-libtdepim-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_tdeincludedir}/tdepimmacros.h
%{tde_libdir}/libtdepim.la %{tde_libdir}/libtdepim.la
%{tde_libdir}/libtdepim.so %{tde_libdir}/libtdepim.so

@ -145,7 +145,8 @@ BuildRequires: pcre-devel
BuildRequires: libacl-devel BuildRequires: libacl-devel
# XSCREENSAVER support # XSCREENSAVER support
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} # RHEL 8: available in EPEL
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1 %define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
BuildRequires: libXScrnSaver-devel BuildRequires: libXScrnSaver-devel

Loading…
Cancel
Save