From b4b8ef98b6e04500435b1ebc28a8ab5dd79a7cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 1 Dec 2013 18:36:42 +0100 Subject: RPM Packaging: TDE 3.5.13.2 updates for openSUSE 13.1 --- redhat/applications/kbfx/kbfx-3.5.13.2.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'redhat/applications/kbfx') diff --git a/redhat/applications/kbfx/kbfx-3.5.13.2.spec b/redhat/applications/kbfx/kbfx-3.5.13.2.spec index 537ea1546..0af953f7d 100644 --- a/redhat/applications/kbfx/kbfx-3.5.13.2.spec +++ b/redhat/applications/kbfx/kbfx-3.5.13.2.spec @@ -75,7 +75,8 @@ Homepage: http://www.kbfx.org -e "s|/usr/include/tqt|%{tde_includedir}/tqt|" %build -unset QTDIR || : ; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" @@ -85,10 +86,10 @@ if [ -d "/usr/X11R6" ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ @@ -103,6 +104,7 @@ cd build -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \ -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\ -DDOC_INSTALL_DIR=%{tde_tdedocdir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ \ -- cgit v1.2.1