Author: glen Date: Wed Jan 5 21:59:29 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- new, based on fedora spec
---- Files affected:
packages/qesteidutil:
qesteidutil-0.3.0-system_qtsingleapplication.patch (NONE -> 1.1) (NEW),
qesteidutil.spec (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/qesteidutil/qesteidutil-0.3.0-system_qtsingleapplication.patch
diff -u /dev/null
packages/qesteidutil/qesteidutil-0.3.0-system_qtsingleapplication.patch:1.1
--- /dev/null Wed Jan 5 22:59:29 2011
+++ packages/qesteidutil/qesteidutil-0.3.0-system_qtsingleapplication.patch
Wed Jan 5 22:59:24 2011
@@ -0,0 +1,62 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt (revision 3226)
++++ CMakeLists.txt (revision 3227)
+@@ -25,6 +25,18 @@
+ add_definitions(-D_SECURE_SCL=0)
+ endif(MSVC)
+
++# try to find system copy of qtsingleapplication
++find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h
PATH_SUFFIXES QtSolutions)
++find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
++if(QTSINGLEAPPLICATION_INCLUDE_DIRS AND QTSINGLEAPPLICATION_LIBRARIES)
++ message(STATUS "Found QtSingleApplication:
${QTSINGLEAPPLICATION_LIBRARIES}")
++else()
++ message(STATUS "QtSingleApplication not found; using bundled copy")
++ add_subdirectory(qtsingleapplication)
++ set(QTSINGLEAPPLICATION_INCLUDE_DIRS
${PROJECT_SOURCE_DIR}/qtsingleapplication/src)
++ set(QTSINGLEAPPLICATION_LIBRARIES qtsingleapplication)
++endif()
++
+ set(QT_USE_QTNETWORK true)
+ set(QT_USE_QTWEBKIT true)
+ set(QT_USE_QTXML true)
+@@ -99,8 +111,6 @@
+
+ include(${QT_USE_FILE})
+
+-add_subdirectory( qtsingleapplication )
+-
+ find_package(Subversion)
+ if (Subversion_FOUND AND EXISTS ${PROJECT_SOURCE_DIR}/.svn)
+ Subversion_WC_INFO(${PROJECT_SOURCE_DIR} PROJECT)
+@@ -113,10 +123,10 @@
+ include_directories(
+ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}
++ ${LIBP11_INCLUDE_DIR}
+ ${OPENSSL_INCLUDE_DIR}
+- ${LIBP11_INCLUDE_DIR}
++ ${QTSINGLEAPPLICATION_INCLUDE_DIRS}
+ ${SMARTCARDPP_INCLUDE_DIR}
+- qtsingleapplication/src
+ )
+
+ if(APPLE)
+@@ -170,13 +180,13 @@
+ target_link_libraries(qesteidutil
+ ${QT_QTMAIN_LIBRARY}
+ ${QT_LIBRARIES}
++ ${LIBP11_LIBRARIES}
+ ${OPENSSL_LIBRARIES}
+ ${OPENSSLCRYPTO_LIBRARIES}
+- ${LIBP11_LIBRARIES}
++ ${QTSINGLEAPPLICATION_LIBRARIES}
+ ${SMARTCARDPP_LIBRARIES}
+- ${WIN_LIBRARIES}
++ ${WIN_LIBRARIES}
+ ${CARBON_LIBRARY}
+- qtsingleapplication
+ )
+
+ if(UNIX AND NOT APPLE)
================================================================
Index: packages/qesteidutil/qesteidutil.spec
diff -u /dev/null packages/qesteidutil/qesteidutil.spec:1.1
--- /dev/null Wed Jan 5 22:59:29 2011
+++ packages/qesteidutil/qesteidutil.spec Wed Jan 5 22:59:24 2011
@@ -0,0 +1,74 @@
+# $Revision$, $Date$
+Summary: Estonian ID card utility
+Name: qesteidutil
+Version: 0.3.0
+Release: 1
+License: LGPL v2+
+Group: X11/Applications
+URL: http://code.google.com/p/esteid/
+Source0: http://esteid.googlecode.com/files/%{name}-%{version}.tar.bz2
+# Source0-md5: f91ddc6022ecf86753dc3492a8e33baf
+# Use system qtsingleapplication, backported from upstream SVN
+Patch0: %{name}-0.3.0-system_qtsingleapplication.patch
+BuildRequires: QtSingleApplication-devel
+BuildRequires: QtWebKit-devel
+BuildRequires: cmake
+BuildRequires: desktop-file-utils
+BuildRequires: libp11-devel
+BuildRequires: openssl-devel
+BuildRequires: qt4-build
+BuildRequires: smartcardpp-devel
+Requires: hicolor-icon-theme
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+QEsteidUtil is an application for managing Estonian ID Card. In an
+user-friendly interface it is possible to change and unlock PINs,
+examine detailed information about personal data file on the card,
+extract and view certificates, set up mobile ID, and configure
[email protected] email.
+
+%prep
+%setup -q
+%patch0 -p0
+
+# Remove bundled qtsingleapplication to make sure it isn't used
+rm -rf qtsingleapplication
+
+%build
+install -d build
+cd build
+%cmake ..
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__make} -C build install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/qesteidutil.desktop
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%update_icon_cache hicolor
+
+%postun
+%update_icon_cache hicolor
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS NEWS README
+%attr(755,root,root) %{_bindir}/qesteidutil
+%{_desktopdir}/qesteidutil.desktop
+%{_iconsdir}/hicolor/*/apps/qesteidutil.png
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <[email protected]>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1 2011/01/05 21:59:24 glen
+- new, based on fedora spec
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
