From 0a2cd2900b239c22e45694c23678add0ddbbb539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 1 Jan 2019 22:53:15 +0100 Subject: [PATCH] RPM: switch gwenview-i18n to cmake --- ...ew-i18n-14.0.0.spec => gwenview-i18n.spec} | 46 +++++++++---------- 1 file changed, 21 insertions(+), 25 deletions(-) rename redhat/applications/gwenview-i18n/{gwenview-i18n-14.0.0.spec => gwenview-i18n.spec} (83%) diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec b/redhat/applications/gwenview-i18n/gwenview-i18n.spec similarity index 83% rename from redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec rename to redhat/applications/gwenview-i18n/gwenview-i18n.spec index b5bee8041..59bbfaa5b 100644 --- a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec +++ b/redhat/applications/gwenview-i18n/gwenview-i18n.spec @@ -66,7 +66,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -107,32 +107,31 @@ KIPI image framework. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -./configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} \ - --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_VERBOSE_MAKEFILE=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --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}" \ + -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. %__make %{?_smp_mflags} @@ -140,14 +139,11 @@ export PATH="%{tde_bindir}:${PATH}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build ## File lists %find_lang gwenview -# Removes useless files (-devel ?) -%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so - %clean %__rm -rf %{buildroot}