From 8fb1b9251ac496f0a557118003d90018cac34b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 1 Jan 2019 22:55:19 +0100 Subject: RPM: switch kplayer to cmake --- redhat/applications/kplayer/kplayer.spec | 50 ++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 21 deletions(-) (limited to 'redhat/applications') diff --git a/redhat/applications/kplayer/kplayer.spec b/redhat/applications/kplayer/kplayer.spec index ed6be1be0..45a4ae38f 100644 --- a/redhat/applications/kplayer/kplayer.spec +++ b/redhat/applications/kplayer/kplayer.spec @@ -61,11 +61,20 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool +# IDN support +BuildRequires: libidn-devel + +# ACL support +BuildRequires: libacl-devel + +# OPENSSL support +BuildRequires: openssl-devel + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -106,32 +115,31 @@ file properties for setting file specific options. %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}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +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} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DPLUGIN_INSTALL_DIR=%{tde_tdelibdir} \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} || %__make @@ -139,7 +147,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} -- cgit v1.2.1