commit c04587b0490818e7d3bed9af7093ea46b549c44f
Author: Elan Ruusamäe <[email protected]>
Date: Tue Jun 3 00:12:37 2014 +0300
build fixes
kdebase.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/kdebase.spec b/kdebase.spec
index 75d8e53..ad141be 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -103,6 +103,7 @@ BuildRequires: libsmbclient-devel >= 1:3.0.23d-3
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
BuildRequires: libtool
+BuildRequires: libtqtinterface-devel >= %{version}
BuildRequires: libusb-compat-devel
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
@@ -1153,8 +1154,10 @@ cd build
# HACK:
CPPFLAGS="%{rpmcflags} $(pkg-config --cflags dbus-1 dbus-glib-1)"
+export CXXFLAGS="%{rpmcxxflags} $(pkg-config --cflags dbus-1 dbus-glib-1)"
%cmake \
+ -Wno-dev \
-DPLUGIN_INSTALL_DIR=%{_libexecdir} \
-DHTML_INSTALL_DIR=%{_kdedocdir} \
-DAPPS_INSTALL_DIR=%{_applnkdir} \
@@ -1194,8 +1197,8 @@ CPPFLAGS="%{rpmcflags} $(pkg-config --cflags dbus-1
dbus-glib-1)"
-DBUILD_KDM=OFF \
-DBUILD_KSMSERVER=OFF \
-DWITH_HAL=OFF \
- -DWITH_KDESKTOP_LOCK_BACKTRACE=OFF \
%endif
+ -DWITH_KDESKTOP_LOCK_BACKTRACE=OFF \
-DKCHECKPASS_PAM_SERVICE="xdm" \
-DTDM_PAM_SERVICE="xdm" \
-DTDESCREENSAVER_PAM_SERVICE="xdm" \
@@ -1426,8 +1429,8 @@ rm -rf $RPM_BUILD_ROOT
%postun common-konsole
/usr/bin/fontpostinst misc
-%post core -p /sbin/ldconfig
-%postun core -p /sbin/ldconfig
+%post core -p /sbin/ldconfig
+%postun core -p /sbin/ldconfig
%post desktop-libs -p /sbin/ldconfig
%postun desktop-libs -p /sbin/ldconfig
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdebase.git/commitdiff/5a3f4cfe9a8984cf40e09f335425b04f87ea9100
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
