packages: QtSingleApplication/QtSingleApplication.spec - more fixes from rh...

[glen]

Author: glen                         Date: Thu Apr 22 21:05:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more fixes from rhbz: use QtLockedFile add .prf
- qmake deps, temp build fixes; rel 2

---- Files affected:
packages/QtSingleApplication:
   QtSingleApplication.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/QtSingleApplication/QtSingleApplication.spec
diff -u packages/QtSingleApplication/QtSingleApplication.spec:1.1 packages/QtSingleApplication/QtSingleApplication.spec:1.2
--- packages/QtSingleApplication/QtSingleApplication.spec:1.1	Thu Apr 22 21:49:02 2010
+++ packages/QtSingleApplication/QtSingleApplication.spec	Thu Apr 22 23:05:28 2010
@@ -1,20 +1,23 @@
 # $Revision$, $Date$
-# TODO
-# - rename as QtSingleApplication ?
-# - subpackage for non-gui once any package appears needing so (QtSingleCoreApplication)
 Summary:	Qt library to start applications only once per user
-Name:		qtsingleapplication
+Name:		QtSingleApplication
 Version:	2.6
-Release:	1
+Release:	2
 License:	GPL v3 or LGPL v2 with exceptions
 Group:		Libraries
 URL:		http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Utilities/qtsingleapplication
-Source0:	http://get.qt.nokia.com/qt/solutions/lgpl/%{name}-%{version}_1-opensource.tar.gz
+Source0:	http://get.qt.nokia.com/qt/solutions/lgpl/qtsingleapplication-%{version}_1-opensource.tar.gz
 # Source0-md5:	902795eb13ecedbdc112f00d7ec22949
-Patch0:		%{name}-build.diff
+Source1:	qtsingleapplication.prf
+Patch0:		qtsingleapplication-build.diff
+Patch1:		qtsingleapplication-dont-bundle-external-libs.patch
+BuildRequires:	QtLockedFile-devel
 BuildRequires:	qt4-build
+BuildRequires:	qt4-qmake
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_qt4_datadir	%{_datadir}/qt4
+
 %description
 For some applications it is useful or even critical that they are
 started only once by any user. Future attempts to start the
@@ -28,24 +31,33 @@
 variant is provided, which avoids dependency on QtGui.
 
 %package	devel
-Summary:	Development files for %{name}
+Summary:	Development files for QtSingleApplication
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	qt4-build
+Requires:	qt4-qmake
 
 %description	devel
 This package contains libraries and header files for developing
-applications that use QtSingleCoreApplication.
+applications that use QtSingleApplication.
 
 %prep
-%setup -q -n %{name}-%{version}_1-opensource
+%setup -q -n qtsingleapplication-%{version}_1-opensource
 %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
-qmake-qt4
+./configure \
+	-library
+
+# XXX fix QtLockedFile package
+qmake-qt4 INCLUDEPATH+=%{_includedir}/QtSolutions
 %{__make}
 
 %install
@@ -65,6 +77,9 @@
     src/QtSingleCoreApplication \
     $RPM_BUILD_ROOT%{_includedir}/QtSolutions
 
+install -d $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,14 +89,21 @@
 %files
 %defattr(644,root,root,755)
 %doc LGPL_EXCEPTION.txt LICENSE.* README.TXT
-%attr(755,root,root) %{_libdir}/libQtSolutions_SingleApplication-%{version}.so.1
 %attr(755,root,root) %{_libdir}/libQtSolutions_SingleApplication-%{version}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQtSolutions_SingleApplication-%{version}.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc examples
 %{_libdir}/libQtSolutions_SingleApplication-%{version}.so
-%{_includedir}/QtSolutions
+# XXX dir shared dir with QtLockedFile.spec
+%dir %{_includedir}/QtSolutions
+%{_includedir}/QtSolutions/QtSingleApplication
+%{_includedir}/QtSolutions/QtSingleCoreApplication
+%{_includedir}/QtSolutions/qtsingleapplication.h
+%{_includedir}/QtSolutions/qtsinglecoreapplication.h
+%{_qt4_datadir}/mkspecs/features/qtsingleapplication.prf
+
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -89,5 +111,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/04/22 21:05:28  glen
+- more fixes from rhbz: use QtLockedFile add .prf
+- qmake deps, temp build fixes; rel 2
+
 Revision 1.1  2010/04/22 19:49:02  glen
 - new, from https://bugzilla.redhat.com/show_bug.cgi?id=581220
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/QtSingleApplication/QtSingleApplication.spec?r1=1.1&r2=1.2&f=u