SPECS (AC-branch): qca.spec - try cmake on AC-branch (maybe this w...

shadzik shadzik at pld-linux.org
Thu Oct 18 21:49:11 CEST 2007


Author: shadzik                      Date: Thu Oct 18 19:49:11 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- try cmake on AC-branch (maybe this will help build on builders?)

---- Files affected:
SPECS:
   qca.spec (1.16 -> 1.16.2.1) 

---- Diffs:

================================================================
Index: SPECS/qca.spec
diff -u SPECS/qca.spec:1.16 SPECS/qca.spec:1.16.2.1
--- SPECS/qca.spec:1.16	Thu Oct 18 20:21:31 2007
+++ SPECS/qca.spec	Thu Oct 18 21:49:06 2007
@@ -13,11 +13,13 @@
 Group:		Libraries
 Source0:	http://delta.affinix.com/download/qca/2.0/%{name}-%{version}.tar.bz2
 # Source0-md5:	07d54358ef4880d05b3c6f56b629aa55
+Patch0:		%{name}-cmake.patch
 URL:		http://delta.affinix.com/qca/
 BuildRequires:	QtCore-devel
 BuildRequires:	QtGui-devel
 BuildRequires:	QtNetwork-devel
 BuildRequires:	QtTest-devel
+BuildRequires:	cmake
 BuildRequires:	libstdc++-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	qt4-build
@@ -46,13 +48,16 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-./configure \
-	--prefix=%{_prefix} \
-	--libdir=%{_libdir} \
-	--datadir=%{_datadir}
-qt4-qmake
+mkdir build
+cd build
+%{__cmake} \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DLIB_INSTALL_DIR=%{_libdir} \
+	-DQT_MKSPECS_DIR=%{_datadir}/qt4/mkspecs/features \
+	../
 %{__make}
 
 %install
@@ -60,10 +65,10 @@
 
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 
-%{__make} install \
-	INSTALL_ROOT=$RPM_BUILD_ROOT
+%{__make} -C build install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install lib/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
+install build/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 
 %if "%{_lib}" == "lib64"
 rm -rf  $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig
@@ -80,16 +85,16 @@
 %doc README
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/*.so.*
-%{_mandir}/man1/*.1*
-%{_datadir}/qca
+#%{_mandir}/man1/*.1*
+#%{_datadir}/qca
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.so
 %{_includedir}/QtCrypto
 %{_pkgconfigdir}/*.pc
-%{_libdir}/libqca.prl
-%{_datadir}/qt4/mkspecs/features/crypto.prf
+#%{_libdir}/libqca.prl
+#%{_datadir}/qt4/mkspecs/features/crypto.prf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -97,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16.2.1  2007/10/18 19:49:06  shadzik
+- try cmake on AC-branch (maybe this will help build on builders?)
+
 Revision 1.16  2007/10/18 18:21:31  shadzik
 - no need to export QTDIR when using qt4-qmake
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qca.spec?r1=1.16&r2=1.16.2.1&f=u



More information about the pld-cvs-commit mailing list