Author: glen Date: Sat Jan 22 18:38:26 2011 GMT Module: packages Tag: HEAD ---- Log message: - fix build, install files
---- Files affected: packages/pam-pam_face-authentication: pam-pam_face-authentication.spec (1.2 -> 1.3) , cmake.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/pam-pam_face-authentication/pam-pam_face-authentication.spec diff -u packages/pam-pam_face-authentication/pam-pam_face-authentication.spec:1.2 packages/pam-pam_face-authentication/pam-pam_face-authentication.spec:1.3 --- packages/pam-pam_face-authentication/pam-pam_face-authentication.spec:1.2 Tue Jan 18 10:11:49 2011 +++ packages/pam-pam_face-authentication/pam-pam_face-authentication.spec Sat Jan 22 19:38:21 2011 @@ -9,6 +9,8 @@ URL: http://www.pam-face-authentication.org Source0: http://pam-face-authentication.googlecode.com/files/pam-face-authentication-%{version}.tar.gz # Source0-md5: 5ef71bcf4bdebd2ee7216387ef17fc27 +Patch0: cmake.patch +BuildRequires: cmake >= 2.6 BuildRequires: gsl-devel BuildRequires: libstdc++-devel BuildRequires: ncurses-devel @@ -19,10 +21,16 @@ %description This is Pluggable Authentication Module for Face based Authentication. + %description -l pl.UTF-8 Modularny system uwierzytelniania PAM opearty o weryfikację twarzy. + %prep %setup -q -n pam-face-authentication-%{version} +%patch0 -p1 + +# use cmake file provided by opencv-devel +rm cmake/modules/FindOpenCV.cmake %build install -d build @@ -32,15 +40,27 @@ %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ +%{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT +# wtf? +mv $RPM_BUILD_ROOT{%{_prefix}/kde/4/bin,%{_bindir}}/xwindowFaceAuth + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ChangeLog NEWS AUTHORS README +%doc ChangeLog AUTHORS README +%attr(755,root,root) /%{_lib}/security/pam_face_authentication.so +%attr(755,root,root) %{_bindir}/qt-facetrainer +%attr(755,root,root) %{_bindir}/xwindowFaceAuth +%{_desktopdir}/qt-facetrainer.desktop +%{_datadir}/haarcascade.xml +%{_datadir}/haarcascade_eye.xml +%{_datadir}/haarcascade_eye_tree_eyeglasses.xml +%{_datadir}/haarcascade_nose.xml +%{_iconsdir}/pfa-logo.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -48,6 +68,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2011/01/22 18:38:21 glen +- fix build, install files + Revision 1.2 2011/01/18 09:11:49 blekot - pl in summary and description - fixed typo ================================================================ Index: packages/pam-pam_face-authentication/cmake.patch diff -u /dev/null packages/pam-pam_face-authentication/cmake.patch:1.1 --- /dev/null Sat Jan 22 19:38:26 2011 +++ packages/pam-pam_face-authentication/cmake.patch Sat Jan 22 19:38:21 2011 @@ -0,0 +1,22 @@ +--- pam-face-authentication-0.3/CMakeLists.txt~ 2009-08-09 19:41:56.000000000 +0300 ++++ pam-face-authentication-0.3/CMakeLists.txt 2011-01-22 15:12:14.836698432 +0200 +@@ -88,7 +88,7 @@ + + INCLUDE_DIRECTORIES( "${CMAKE_SOURCE_DIR}/include" ) + INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ) +-INCLUDE_DIRECTORIES(${OPENCV_INCLUDE_DIR}) ++INCLUDE_DIRECTORIES(${OPENCV_INCLUDE_DIRS}) + INCLUDE_DIRECTORIES(${PAM_INCLUDE_DIR}) + ADD_LIBRARY(pam_face_authentication SHARED ${PAM_FACE_AUTHENTICATE_SRCS}) + SET_TARGET_PROPERTIES( pam_face_authentication PROPERTIES PREFIX "") +@@ -96,8 +96,8 @@ + TARGET_LINK_LIBRARIES( xwindowFaceAuth ${X11_LIBRARIES}) + + ADD_EXECUTABLE( qt-facetrainer ${QT_FACETRAINER_SRCS} ${QT_FACETRAINER_MOC_SRCS} ${QT_FACETRAINER_RC_SRCS} ${QT_FACETRAINER_UI_HDRS} ) +-TARGET_LINK_LIBRARIES( pam_face_authentication ${PAM_LIBRARIES} ${OPENCV_LIBRARIES}) +-TARGET_LINK_LIBRARIES( qt-facetrainer ${QT_LIBRARIES} ${OPENCV_LIBRARIES}) ++TARGET_LINK_LIBRARIES( pam_face_authentication ${PAM_LIBRARIES} ${OpenCV_LIBS}) ++TARGET_LINK_LIBRARIES( qt-facetrainer ${QT_LIBRARIES} ${OpenCV_LIBS}) + + if( UNIX AND NOT APPLE ) + if( NOT DESKTOP_ENTRY ) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pam-pam_face-authentication/pam-pam_face-authentication.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
