rpms/qtsingleapplication/devel import.log, NONE, 1.1 qtsingleapplication-build.diff, NONE, 1.1 qtsingleapplication-dont-bundle-external-libs.patch, NONE, 1.1 qtsingleapplication.prf, NONE, 1.1 qtsingleapplication.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Thu Jul 8 02:46:30 UTC 2010

Author: oget

Update of /cvs/pkgs/rpms/qtsingleapplication/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8812/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qtsingleapplication-build.diff 
	qtsingleapplication-dont-bundle-external-libs.patch 
	qtsingleapplication.prf qtsingleapplication.spec 
Log Message:
* Sun Jun 04 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 2.6.1-1
- Change version to 2.6.1. Upstream uses weird version convention 2.6_1
- Own the directory %%{_qt4_headerdir}/QtSolutions/

* Sat May 01 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 2.6-3
- Add comments to the extra source and patches
- Add a chmod 755 to make sure that the library gets the right permission

* Thu Apr 15 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 2.6-2
- Include .prf file
- Don't bundle external qtlockedfile library
- Fix typo in the description

* Sun Apr 11 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 2.6-1
- Initial Fedora package. Specfile partly borrowed from opensuse

* Thu Dec  3 2009 Todor Prokopov <koprok at nand.bg>
- Initial package.

--- NEW FILE import.log ---
qtsingleapplication-2_6_1-1_fc13:HEAD:qtsingleapplication-2.6.1-1.fc13.src.rpm:1278557176

qtsingleapplication-build.diff:
 qtsingleapplication.pro     |    1 -
 src/QtSingleCoreApplication |    1 +
 src/qtsingleapplication.pri |    4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE qtsingleapplication-build.diff ---
diff -urN qtsingleapplication-2.6-opensource-orig/qtsingleapplication.pro qtsingleapplication-2.6-opensource/qtsingleapplication.pro
--- qtsingleapplication-2.6-opensource-orig/qtsingleapplication.pro	2009-04-21 13:30:29.000000000 +0300
+++ qtsingleapplication-2.6-opensource/qtsingleapplication.pro	2009-12-03 16:28:20.000000000 +0200
@@ -2,4 +2,3 @@
 CONFIG += ordered
 include(common.pri)
 qtsingleapplication-uselib:SUBDIRS=buildlib
-SUBDIRS+=examples
diff -urN qtsingleapplication-2.6-opensource-orig/src/qtsingleapplication.pri qtsingleapplication-2.6-opensource/src/qtsingleapplication.pri
--- qtsingleapplication-2.6-opensource-orig/src/qtsingleapplication.pri	2009-04-21 13:30:29.000000000 +0300
+++ qtsingleapplication-2.6-opensource/src/qtsingleapplication.pri	2009-12-03 16:28:13.000000000 +0200
@@ -6,8 +6,8 @@
 qtsingleapplication-uselib:!qtsingleapplication-buildlib {
     LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
 } else {
-    SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp
-    HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h
+    SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
+    HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
 }
 
 win32 {
diff -urN qtsingleapplication-2.6-opensource-orig/src/QtSingleCoreApplication qtsingleapplication-2.6-opensource/src/QtSingleCoreApplication
--- qtsingleapplication-2.6-opensource-orig/src/QtSingleCoreApplication	1970-01-01 02:00:00.000000000 +0200
+++ qtsingleapplication-2.6-opensource/src/QtSingleCoreApplication	2009-12-03 16:28:13.000000000 +0200
@@ -0,0 +1 @@
+#include "qtsinglecoreapplication.h"

qtsingleapplication-dont-bundle-external-libs.patch:
 qtlocalpeer.cpp             |   11 +----------
 qtlocalpeer.h               |    4 +---
 qtsingleapplication.pri     |    1 +
 qtsinglecoreapplication.pri |    2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

--- NEW FILE qtsingleapplication-dont-bundle-external-libs.patch ---
diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
--- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp	2009-12-16 05:43:33.000000000 -0500
+++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp	2010-04-15 20:54:19.000000000 -0400
@@ -59,15 +59,6 @@ static PProcessIdToSessionId pProcessIdT
 #include <time.h>
 #endif
 
-namespace QtLP_Private {
-#include "qtlockedfile.cpp"
-#if defined(Q_OS_WIN)
-#include "qtlockedfile_win.cpp"
-#else
-#include "qtlockedfile_unix.cpp"
-#endif
-}
-
 const char* QtLocalPeer::ack = "ack";
 
 QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
@@ -118,7 +109,7 @@ bool QtLocalPeer::isClient()
     if (lockFile.isLocked())
         return false;
 
-    if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false))
+    if (!lockFile.lock(QtLockedFile::WriteLock, false))
         return true;
 
     bool res = server->listen(socketName);
diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h
--- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h	2009-12-16 05:43:33.000000000 -0500
+++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h	2010-04-15 20:54:38.000000000 -0400
@@ -49,9 +49,7 @@
 #include <QtNetwork/QLocalSocket>
 #include <QtCore/QDir>
 
-namespace QtLP_Private {
 #include "qtlockedfile.h"
-}
 
 class QtLocalPeer : public QObject
 {
@@ -74,7 +72,7 @@ protected:
     QString id;
     QString socketName;
     QLocalServer* server;
-    QtLP_Private::QtLockedFile lockFile;
+    QtLockedFile lockFile;
 
 private:
     static const char* ack;
diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri
--- qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri	2009-12-16 05:43:33.000000000 -0500
+++ qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri	2010-04-15 20:54:19.000000000 -0400
@@ -2,6 +2,7 @@ include(../common.pri)
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 QT *= network
+CONFIG *= qtlockedfile
 
 qtsingleapplication-uselib:!qtsingleapplication-buildlib {
     LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.pri qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.pri
--- qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.pri	2009-12-16 05:43:33.000000000 -0500
+++ qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.pri	2010-04-15 20:54:19.000000000 -0400
@@ -2,7 +2,7 @@ INCLUDEPATH	+= $$PWD
 DEPENDPATH      += $$PWD
 HEADERS		+= $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
 SOURCES		+= $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
-
+CONFIG *= qtlockedfile
 QT *= network
 
 win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {


--- NEW FILE qtsingleapplication.prf ---
INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions
DEPENDPATH  *= $$QMAKE_INCDIR_QT/QtSolutions
LIBS *= -lQtSolutions_SingleApplication-2.6
QT *= network


--- NEW FILE qtsingleapplication.spec ---
# Upstream uses weird versioning convention
%global upstreamver 2.6_1-opensource

Summary:	Qt library to start applications only once per user
Name:		qtsingleapplication
Version:	2.6.1
Release:	1%{?dist}
Group:		System Environment/Libraries
License:	GPLv3 or LGPLv2 with exceptions
URL:		http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Utilities/qtsingleapplication
Source0:	http://get.qt.nokia.com/qt/solutions/lgpl/qtsingleapplication-%{upstreamver}.tar.gz
# The following source and patches are sent upstream:
# http://bugreports.qt.nokia.com/browse/QTSOLBUG-119
# To add qmake support for convenience for packages using this library:
Source1:	qtsingleapplication.prf
# Don't build examples, Include qtsinglecoreapplication library in the build:
Patch0:		qtsingleapplication-build.diff
# The library includes a duplicate of qtlockedfile. We link to it dynamically instead:
Patch1:		qtsingleapplication-dont-bundle-external-libs.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	qt4-devel
BuildRequires:	qtlockedfile-devel

%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}

%description
For some applications it is useful or even critical that they are started
only once by any user. Future attempts to start the application should
activate any already running instance, and possibly perform requested
actions, e.g. loading a file, in that instance.

The QtSingleApplication class provides an interface to detect a running
instance, and to send command strings to that instance.

For console (non-GUI) applications, the QtSingleCoreApplication variant
is provided, which avoids dependency on QtGui.

%package	devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	qt4-devel

%description	devel
This package contains libraries and header files for developing applications
that use QtSingleApplication.

%prep
%setup -q -n %{name}-%{upstreamver}
%patch0 -p1
%patch1 -p1

# We already disabled bundling this extrenal library.
# But just to make sure:
rm src/{QtLocked,qtlocked}*

%build
touch .licenseAccepted
# Does not use GNU configure
./configure -library
%{_qt4_qmake}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

# libraries
mkdir -p $RPM_BUILD_ROOT%{_libdir}
cp -a lib/* $RPM_BUILD_ROOT%{_libdir}
chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so.*.*.*

# headers
mkdir -p $RPM_BUILD_ROOT%{_includedir}/QtSolutions
cp -a \
    src/qtsingleapplication.h \
    src/QtSingleApplication \
    src/qtsinglecoreapplication.h \
    src/QtSingleCoreApplication \
    $RPM_BUILD_ROOT%{_includedir}/QtSolutions

mkdir -p $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features
cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features/

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc LGPL_EXCEPTION.txt LICENSE.* README.TXT
%{_qt4_libdir}/lib*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc examples
%{_qt4_libdir}/lib*.so
%{_qt4_headerdir}/QtSolutions/
%{_qt4_datadir}/mkspecs/features/%{name}.prf

%changelog
* Sun Jun 04 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 2.6.1-1
- Change version to 2.6.1. Upstream uses weird version convention 2.6_1
- Own the directory %%{_qt4_headerdir}/QtSolutions/

* Sat May 01 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 2.6-3
- Add comments to the extra source and patches
- Add a chmod 755 to make sure that the library gets the right permission

* Thu Apr 15 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 2.6-2
- Include .prf file
- Don't bundle external qtlockedfile library
- Fix typo in the description

* Sun Apr 11 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 2.6-1
- Initial Fedora package. Specfile partly borrowed from opensuse

* Thu Dec  3 2009 Todor Prokopov <koprok at nand.bg>
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtsingleapplication/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Jul 2010 01:24:24 -0000	1.1
+++ .cvsignore	8 Jul 2010 02:46:30 -0000	1.2
@@ -0,0 +1 @@
+qtsingleapplication-2.6_1-opensource.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtsingleapplication/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Jul 2010 01:24:25 -0000	1.1
+++ sources	8 Jul 2010 02:46:30 -0000	1.2
@@ -0,0 +1 @@
+902795eb13ecedbdc112f00d7ec22949  qtsingleapplication-2.6_1-opensource.tar.gz

