[qesteidutil] Initial import (#641042)

Kalev Lember kalev at fedoraproject.org
Fri Oct 8 20:49:55 UTC 2010


commit acefdaeae6c93219bd295a6c7ced92b239c58958
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Fri Oct 8 23:49:43 2010 +0300

    Initial import (#641042)

 .gitignore                                         |    1 +
 qesteidutil-0.3.0-system_qtsingleapplication.patch |   62 ++++++++++++
 qesteidutil.spec                                   |  102 ++++++++++++++++++++
 sources                                            |    1 +
 4 files changed, 166 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..efc7d5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/qesteidutil-0.3.0.tar.bz2
diff --git a/qesteidutil-0.3.0-system_qtsingleapplication.patch b/qesteidutil-0.3.0-system_qtsingleapplication.patch
new file mode 100644
index 0000000..fefb17e
--- /dev/null
+++ b/qesteidutil-0.3.0-system_qtsingleapplication.patch
@@ -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)
diff --git a/qesteidutil.spec b/qesteidutil.spec
new file mode 100644
index 0000000..374fb9f
--- /dev/null
+++ b/qesteidutil.spec
@@ -0,0 +1,102 @@
+Name:           qesteidutil
+Version:        0.3.0
+Release:        2%{?dist}
+Summary:        Estonian ID card utility
+
+Group:          Applications/Productivity
+License:        LGPLv2+
+URL:            http://code.google.com/p/esteid/
+Source0:        http://esteid.googlecode.com/files/%{name}-%{version}.tar.bz2
+# Use system qtsingleapplication, backported from upstream SVN
+Patch0:         qesteidutil-0.3.0-system_qtsingleapplication.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  cmake
+BuildRequires:  desktop-file-utils
+BuildRequires:  libp11-devel
+BuildRequires:  openssl-devel
+BuildRequires:  qt4-devel
+BuildRequires:  qt4-webkit-devel
+BuildRequires:  qtsingleapplication-devel
+BuildRequires:  smartcardpp-devel
+Requires:       opensc%{?_isa}
+
+%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 @eesti.ee email.
+
+
+%prep
+%setup -q
+%patch0 -p0 -b .system_qtsingleapplication
+
+# Remove bundled qtsingleapplication to make sure it isn't used
+rm -rf qtsingleapplication
+
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/qesteidutil.desktop
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README
+%{_bindir}/qesteidutil
+%{_datadir}/applications/qesteidutil.desktop
+%{_datadir}/icons/hicolor/*/apps/qesteidutil.png
+
+
+%changelog
+* Thu Oct 07 2010 Kalev Lember <kalev at smartlink.ee> - 0.3.0-2
+- Backported patch to use system qtsingleapplication (#641042)
+
+* Thu Oct 07 2010 Kalev Lember <kalev at smartlink.ee> - 0.3.0-1
+- Update to 0.3.0
+
+* Tue May 11 2010 Kalev Lember <kalev at smartlink.ee> - 0.2.0-0.19.svn2685
+- BR qt4-webkit-devel (F14+)
+
+* Mon Mar 29 2010 Kalev Lember <kalev at smartlink.ee> - 0.2.0-0.18.svn2685
+- Spec file clean up
+- Added AUTHORS and COPYING docs
+- Cleaned up nightly build changelog entries
+
+* Fri Feb 26 2010 Kalev Lember <kalev at smartlink.ee> - 0.2.0-0.14.svn2499
+- rebuilt with Qt 4.6
+
+* Thu Jan 21 2010 Kalev Lember <kalev at smartlink.ee> - 0.2.0-0.11.svn2455
+- rebuilt with new libp11
+
+* Sun Jun 14 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.0-0.1.svn714
+- Initial RPM release.
diff --git a/sources b/sources
index e69de29..1e57471 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+f91ddc6022ecf86753dc3492a8e33baf  qesteidutil-0.3.0.tar.bz2


More information about the scm-commits mailing list