packages: qesteidutil/qesteidutil-0.3.0-system_qtsingleapplication.patch, q...

[glen]

Author: glen                         Date: Sun Jan  8 11:55:53 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.3.1

---- Files affected:
packages/qesteidutil:
   qesteidutil-0.3.0-system_qtsingleapplication.patch (1.1 -> 1.2) , qesteidutil.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/qesteidutil/qesteidutil-0.3.0-system_qtsingleapplication.patch
diff -u packages/qesteidutil/qesteidutil-0.3.0-system_qtsingleapplication.patch:1.1 packages/qesteidutil/qesteidutil-0.3.0-system_qtsingleapplication.patch:1.2
--- packages/qesteidutil/qesteidutil-0.3.0-system_qtsingleapplication.patch:1.1	Wed Jan  5 22:59:24 2011
+++ packages/qesteidutil/qesteidutil-0.3.0-system_qtsingleapplication.patch	Sun Jan  8 12:55:48 2012
@@ -1,62 +1,11 @@
-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 @@
- 
+--- qesteidutil-0.3.1/CMakeLists.txt~	2011-07-06 19:50:13.000000000 +0300
++++ qesteidutil-0.3.1/CMakeLists.txt	2012-01-08 13:51:46.645405478 +0200
+@@ -35,7 +35,7 @@
  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)
+ # try to find system copy of qtsingleapplication
+-find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
++find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt4/QtSolutions QtSolutions)
+ find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
+ if(QTSINGLEAPPLICATION_INCLUDE_DIRS AND QTSINGLEAPPLICATION_LIBRARIES)
+     message(STATUS "Found QtSingleApplication: ${QTSINGLEAPPLICATION_LIBRARIES}")

================================================================
Index: packages/qesteidutil/qesteidutil.spec
diff -u packages/qesteidutil/qesteidutil.spec:1.5 packages/qesteidutil/qesteidutil.spec:1.6
--- packages/qesteidutil/qesteidutil.spec:1.5	Wed Aug 31 11:17:08 2011
+++ packages/qesteidutil/qesteidutil.spec	Sun Jan  8 12:55:48 2012
@@ -1,14 +1,13 @@
 # $Revision$, $Date$
 Summary:	Estonian ID card utility
 Name:		qesteidutil
-Version:	0.3.0
-Release:	3
+Version:	0.3.1
+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
+# Source0-md5:	bd431df405ff813acc4f658c456f2a72
 Patch0:		%{name}-0.3.0-system_qtsingleapplication.patch
 Patch1:		desktop.patch
 BuildRequires:	QtSingleApplication-devel
@@ -35,7 +34,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
 
 # Remove bundled qtsingleapplication to make sure it isn't used
@@ -67,6 +66,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
 %attr(755,root,root) %{_bindir}/qesteidutil
+%{_mandir}/man1/qesteidutil.1*
 %{_desktopdir}/qesteidutil.desktop
 %{_iconsdir}/hicolor/*/apps/qesteidutil.png
 
@@ -76,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2012/01/08 11:55:48  glen
+- up to 0.3.1
+
 Revision 1.5  2011/08/31 09:17:08  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qesteidutil/qesteidutil-0.3.0-system_qtsingleapplication.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qesteidutil/qesteidutil.spec?r1=1.5&r2=1.6&f=u