update clementine patch against current git (841982ceec9d30a7ab7324979a0fd5c9c36fd121)

[packages/QtSingleApplication.git] / QtSingleApplication.spec

diff --git a/QtSingleApplication.spec b/QtSingleApplication.spec
index 8b08fd2b5beb924c495ea364f872dfa0d844a3b6..68e99041068587556c6c35226ae92adddde18726 100644 (file)
--- a/QtSingleApplication.spec
+++ b/QtSingleApplication.spec
@@ -1,25 +1,32 @@
+# last commit to qtsingleapplication subdir in
+# https://qt.gitorious.org/qt-solutions/qt-solutions/
+%define        commit  841982ceec9d30a7ab7324979a0fd5c9c36fd121
 Summary:       Qt library to start applications only once per user
 Name:          QtSingleApplication
-Version:       2.6
-Release:       2
+Version:       2.6.1
+Release:       1
 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/qtsingleapplication-%{version}_1-opensource.tar.gz
-# Source0-md5: 902795eb13ecedbdc112f00d7ec22949
+# git clone git@gitorious.org:qt-solutions/qt-solutions.git
+# git checkout %{commit}
+# tar -cjf QtSingleApplication-%{version}.tar.bz2 -C qt-solutions/qtsingleapplication .
+Source0:       %{name}-%{version}.tar.bz2
+# Source0-md5: 2442ba5536b99b4b9144bd33ea23cb17
 Source1:       qtsingleapplication.prf
+Source2:       qtsinglecoreapplication.prf
 Patch0:                qtsingleapplication-build.diff
-Patch1:                qtsingleapplication-dont-bundle-external-libs.patch
+Patch1:                qtlockedfile.patch
+Patch2:                clementine.patch
+URL:           http://doc.qt.digia.com/solutions/4/qtsingleapplication/qtsingleapplication.html
 BuildRequires: QtCore-devel
 BuildRequires: QtGui-devel
 BuildRequires: QtLockedFile-devel
 BuildRequires: QtNetwork-devel
-BuildRequires: libstdc++-devel
 BuildRequires: qt4-build
 BuildRequires: qt4-qmake
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _qt4_datadir    %{_datadir}/qt4
+%define                qt4dir  %{_datadir}/qt4
 
 %description
 For some applications it is useful or even critical that they are
@@ -33,55 +40,41 @@ 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
+%package devel
 Summary:       Development files for QtSingleApplication
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      qt4-build
 Requires:      qt4-qmake
 
-%description   devel
+%description devel
 This package contains libraries and header files for developing
 applications that use QtSingleApplication.
 
 %prep
-%setup -q -n qtsingleapplication-%{version}_1-opensource
-%patch0 -p1
-%patch1 -p1
+%setup -qc
+%patch0 -p0
+%patch1 -p0
+%patch2 -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
-
-# XXX fix QtLockedFile package
-qmake-qt4 INCLUDEPATH+=%{_includedir}/QtSolutions
+qmake-qt4
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-# libraries
-install -d $RPM_BUILD_ROOT%{_libdir}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/qt4/QtSolutions,%{qt4dir}/mkspecs/features}
 cp -a lib/* $RPM_BUILD_ROOT%{_libdir}
 rm $RPM_BUILD_ROOT%{_libdir}/lib*.so.1.0
-
-# headers
-install -d $RPM_BUILD_ROOT%{_includedir}/QtSolutions
-cp -a \
-    src/qtsingleapplication.h \
-    src/QtSingleApplication \
-    src/qtsinglecoreapplication.h \
-    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
+cp -p src/qtsingle*application.h src/QtSingle*Application $RPM_BUILD_ROOT%{_includedir}/qt4/QtSolutions
+cp -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{qt4dir}/mkspecs/features
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,18 +84,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LGPL_EXCEPTION.txt LICENSE.* README.TXT
-%attr(755,root,root) %{_libdir}/libQtSolutions_SingleApplication-%{version}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libQtSolutions_SingleApplication-%{version}.so.1
+%doc README.TXT
+%attr(755,root,root) %{_libdir}/libQtSolutions_SingleApplication-2.6.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQtSolutions_SingleApplication-2.6.so.1
+%attr(755,root,root) %{_libdir}/libQtSolutions_SingleCoreApplication-2.6.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQtSolutions_SingleCoreApplication-2.6.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc examples
-%{_libdir}/libQtSolutions_SingleApplication-%{version}.so
-# 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
+%{_libdir}/libQtSolutions_SingleApplication-2.6.so
+%{_libdir}/libQtSolutions_SingleCoreApplication-2.6.so
+# XXX dir shared dir
+%dir %{_includedir}/qt4/QtSolutions
+%{_includedir}/qt4/QtSolutions/QtSingleApplication
+%{_includedir}/qt4/QtSolutions/QtSingleCoreApplication
+%{_includedir}/qt4/QtSolutions/qtsingleapplication.h
+%{_includedir}/qt4/QtSolutions/qtsinglecoreapplication.h
+%{qt4dir}/mkspecs/features/qtsingleapplication.prf
+%{qt4dir}/mkspecs/features/qtsinglecoreapplication.prf