rpms/qtsingleapplication/devel qtsinglecoreapplication.prf, NONE, 1.1 qtsingleapplication-build.diff, 1.1, 1.2 qtsingleapplication-dont-bundle-external-libs.patch, 1.1, 1.2 qtsingleapplication.spec, 1.2, 1.3
Orcan Ogetbil
oget at fedoraproject.org
Thu Jul 22 03:08:09 UTC 2010
Author: oget
Update of /cvs/pkgs/rpms/qtsingleapplication/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10775
Modified Files:
qtsingleapplication-build.diff
qtsingleapplication-dont-bundle-external-libs.patch
qtsingleapplication.spec
Added Files:
qtsinglecoreapplication.prf
Log Message:
* Wed Jul 21 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 2.6.1-3
- Split the qtsinglecoreapplication bits into their own subpackages
--- NEW FILE qtsinglecoreapplication.prf ---
INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions
DEPENDPATH *= $$QMAKE_INCDIR_QT/QtSolutions
LIBS *= -lQtSolutions_SingleCoreApplication-2.6
QT *= network
qtsingleapplication-build.diff:
buildlib/buildcorelib.pro | 13 +++++++++++++
common.pri | 2 +-
qtsingleapplication.pro | 3 +--
src/QtSingleCoreApplication | 1 +
src/qtsinglecoreapplication.pri | 21 ++++++++++++++-------
5 files changed, 30 insertions(+), 10 deletions(-)
Index: qtsingleapplication-build.diff
===================================================================
RCS file: /cvs/pkgs/rpms/qtsingleapplication/devel/qtsingleapplication-build.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qtsingleapplication-build.diff 8 Jul 2010 02:46:30 -0000 1.1
+++ qtsingleapplication-build.diff 22 Jul 2010 03:08:09 -0000 1.2
@@ -1,27 +1,72 @@
-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 @@
+diff -rupN qtsingleapplication-2.6_1-opensource.old/buildlib/buildcorelib.pro qtsingleapplication-2.6_1-opensource/buildlib/buildcorelib.pro
+--- qtsingleapplication-2.6_1-opensource.old/buildlib/buildcorelib.pro 1969-12-31 19:00:00.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/buildlib/buildcorelib.pro 2010-07-21 22:09:10.000000000 -0400
+@@ -0,0 +1,13 @@
++TEMPLATE=lib
++CONFIG += qt dll qtsinglecoreapplication-buildlib
++mac:CONFIG += absolute_library_soname
++win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
++include(../src/qtsinglecoreapplication.pri)
++TARGET = $$QTSINGLECOREAPPLICATION_LIBNAME
++DESTDIR = $$QTSINGLEAPPLICATION_LIBDIR
++win32 {
++ DLLDESTDIR = $$[QT_INSTALL_BINS]
++ QMAKE_DISTCLEAN += $$[QT_INSTALL_BINS]\\$${QTSINGLECOREAPPLICATION_LIBNAME}.dll
++}
++target.path = $$DESTDIR
++INSTALLS += target
+diff -rupN qtsingleapplication-2.6_1-opensource.old/common.pri qtsingleapplication-2.6_1-opensource/common.pri
+--- qtsingleapplication-2.6_1-opensource.old/common.pri 2009-12-16 05:43:33.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/common.pri 2010-07-21 22:09:10.000000000 -0400
+@@ -1,6 +1,6 @@
+ infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsingleapplication-uselib
+ TEMPLATE += fakelib
+ QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-2.6)
++QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-2.6)
+ TEMPLATE -= fakelib
+ QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib
+-unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR
+diff -rupN qtsingleapplication-2.6_1-opensource.old/qtsingleapplication.pro qtsingleapplication-2.6_1-opensource/qtsingleapplication.pro
+--- qtsingleapplication-2.6_1-opensource.old/qtsingleapplication.pro 2009-12-16 05:43:33.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/qtsingleapplication.pro 2010-07-21 22:09:10.000000000 -0400
+@@ -1,5 +1,4 @@
+ TEMPLATE=subdirs
CONFIG += ordered
include(common.pri)
- qtsingleapplication-uselib:SUBDIRS=buildlib
+-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
++qtsingleapplication-uselib:SUBDIRS=buildlib/buildlib.pro buildlib/buildcorelib.pro
+diff -rupN qtsingleapplication-2.6_1-opensource.old/src/QtSingleCoreApplication qtsingleapplication-2.6_1-opensource/src/QtSingleCoreApplication
+--- qtsingleapplication-2.6_1-opensource.old/src/QtSingleCoreApplication 1969-12-31 19:00:00.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/src/QtSingleCoreApplication 2010-07-21 22:09:10.000000000 -0400
@@ -0,0 +1 @@
+#include "qtsinglecoreapplication.h"
+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-07-21 22:09:52.000000000 -0400
+@@ -1,10 +1,17 @@
+-INCLUDEPATH += $$PWD
+-DEPENDPATH += $$PWD
+-HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
+-SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
+-
++include(../common.pri)
++INCLUDEPATH += $$PWD
++DEPENDPATH += $$PWD
+ QT *= network
++QT -= gui
+
+-win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
+- DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
++qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib {
++ LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME
++} else {
++ SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
++ HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
+ }
++
++win32 {
++ contains(TEMPLATE, lib):contains(CONFIG, shared):DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT
++ else:qtsinglecoreapplication-uselib:DEFINES += QT_QTSINGLECOREAPPLICATION_IMPORT
++}
+\ No newline at end of file
qtsingleapplication-dont-bundle-external-libs.patch:
qtlocalpeer.cpp | 11 +----------
qtlocalpeer.h | 4 +---
qtsingleapplication.pri | 1 +
qtsinglecoreapplication.pri | 1 +
4 files changed, 4 insertions(+), 13 deletions(-)
Index: qtsingleapplication-dont-bundle-external-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qtsingleapplication/devel/qtsingleapplication-dont-bundle-external-libs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qtsingleapplication-dont-bundle-external-libs.patch 8 Jul 2010 02:46:30 -0000 1.1
+++ qtsingleapplication-dont-bundle-external-libs.patch 22 Jul 2010 03:08:09 -0000 1.2
@@ -1,6 +1,6 @@
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
++++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp 2010-07-21 22:10:43.000000000 -0400
@@ -59,15 +59,6 @@ static PProcessIdToSessionId pProcessIdT
#include <time.h>
#endif
@@ -28,7 +28,7 @@ diff -rupN qtsingleapplication-2.6_1-ope
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
++++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h 2010-07-21 22:10:43.000000000 -0400
@@ -49,9 +49,7 @@
#include <QtNetwork/QLocalSocket>
#include <QtCore/QDir>
@@ -50,7 +50,7 @@ diff -rupN qtsingleapplication-2.6_1-ope
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
++++ qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri 2010-07-21 22:11:08.000000000 -0400
@@ -2,6 +2,7 @@ include(../common.pri)
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
@@ -60,14 +60,13 @@ diff -rupN qtsingleapplication-2.6_1-ope
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
+--- qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.pri 2010-07-21 22:12:19.000000000 -0400
++++ qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.pri 2010-07-21 22:10:29.000000000 -0400
+@@ -3,6 +3,7 @@ INCLUDEPATH += $$PWD
+ DEPENDPATH += $$PWD
QT *= network
+ QT -= gui
++CONFIG *= qtlockedfile
- win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
+ qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib {
+ LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME
Index: qtsingleapplication.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtsingleapplication/devel/qtsingleapplication.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qtsingleapplication.spec 17 Jul 2010 02:05:46 -0000 1.2
+++ qtsingleapplication.spec 22 Jul 2010 03:08:09 -0000 1.3
@@ -4,7 +4,7 @@
Summary: Qt library to start applications only once per user
Name: qtsingleapplication
Version: 2.6.1
-Release: 2%{?dist}
+Release: 3%{?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
@@ -13,6 +13,7 @@ Source0: http://get.qt.nokia.com/qt/solu
# http://bugreports.qt.nokia.com/browse/QTSOLBUG-119
# To add qmake support for convenience for packages using this library:
Source1: qtsingleapplication.prf
+Source2: qtsinglecoreapplication.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:
@@ -35,9 +36,6 @@ actions, e.g. loading a file, in that in
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
@@ -48,6 +46,31 @@ Requires: qt4-devel
This package contains libraries and header files for developing applications
that use QtSingleApplication.
+%package -n qtsinglecoreapplication
+Summary: Qt library to start applications only once per user
+Group: System Environment/Libraries
+Obsoletes: %{name} < 2.6.1-3
+
+%description -n qtsinglecoreapplication
+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.
+
+For console (non-GUI) applications, the QtSingleCoreApplication variant
+is provided, which avoids dependency on QtGui.
+
+%package -n qtsinglecoreapplication-devel
+Summary: Development files for qtsinglecoreapplication
+Group: Development/Libraries
+Obsoletes: %{name}-devel < 2.6.1-3
+Requires: qtsinglecoreapplication = %{version}-%{release}
+Requires: qt4-devel
+
+%description -n qtsinglecoreapplication-devel
+This package contains libraries and header files for developing applications
+that use QtSingleCoreApplication.
+
%prep
%setup -q -n %{name}-%{upstreamver}
%patch0 -p1
@@ -58,6 +81,7 @@ that use QtSingleApplication.
# But just to make sure:
rm src/{QtLocked,qtlocked}*
+
%build
touch .licenseAccepted
# Does not use GNU configure
@@ -84,7 +108,7 @@ cp -a \
$RPM_BUILD_ROOT%{_includedir}/QtSolutions
mkdir -p $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features/
+cp -a %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features/
%clean
rm -rf $RPM_BUILD_ROOT
@@ -93,20 +117,41 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig
+%post -n qtsinglecoreapplication -p /sbin/ldconfig
+
+%postun -n qtsinglecoreapplication -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc LGPL_EXCEPTION.txt LICENSE.* README.TXT
-%{_qt4_libdir}/lib*.so.*
+%{_qt4_libdir}/lib*SingleApplication*.so.*
%files devel
%defattr(-,root,root,-)
%doc doc examples
-%{_qt4_libdir}/lib*.so
-%{_qt4_headerdir}/QtSolutions/
+%{_qt4_libdir}/lib*SingleApplication*.so
+%dir %{_qt4_headerdir}/QtSolutions/
+%{_qt4_headerdir}/QtSolutions/QtSingleApplication
+%{_qt4_headerdir}/QtSolutions/%{name}.h
%{_qt4_datadir}/mkspecs/features/%{name}.prf
+%files -n qtsinglecoreapplication
+%defattr(-,root,root,-)
+%doc LGPL_EXCEPTION.txt LICENSE.*
+%{_qt4_libdir}/lib*SingleCoreApplication*.so.*
+
+%files -n qtsinglecoreapplication-devel
+%defattr(-,root,root,-)
+%{_qt4_libdir}/lib*SingleCoreApplication*.so
+%dir %{_qt4_headerdir}/QtSolutions/
+%{_qt4_headerdir}/QtSolutions/QtSingleCoreApplication
+%{_qt4_headerdir}/QtSolutions/qtsinglecoreapplication.h
+%{_qt4_datadir}/mkspecs/features/qtsinglecoreapplication.prf
+
%changelog
+* Wed Jul 21 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 2.6.1-3
+- Split the qtsinglecoreapplication bits into their own subpackages
+
* Fri Jul 16 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 2.6.1-2
- Add additional API to support clementine.
More information about the scm-commits
mailing list