- pl

- adjusted use-current-version patch, added install patch; use make install and single source dir with split build dirs
- release 4

3 files changed, 79 insertions, 26 deletions

diff --git a/QtLockedFile.spec b/QtLockedFile.spec
index f19422d..3afea4f 100644
--- a/QtLockedFile.spec
+++ b/QtLockedFile.spec
@@ -7,9 +7,10 @@
 # https://qt.gitorious.org/qt-solutions/qt-solutions/
 %define	commit	17b56547d6e0d9a06603231fe2384474f9144829
 Summary:	QFile extension with advisory locking functions
+Summary(pl.UTF-8):	Rozszerzenie QFile z funkcjami do blokowania doradczego
 Name:		QtLockedFile
 Version:	2.4
-Release:	3
+Release:	4
 License:	GPL v3 or LGPL v2 with exceptions
 Group:		Libraries
 # git clone git@gitorious.org:qt-solutions/qt-solutions.git
@@ -20,6 +21,7 @@ Source0:	%{name}-%{version}.tar.bz2
 Source1:	qtlockedfile.prf
 Patch0:		qtlockedfile-dont-build-example.patch
 Patch1:		qtlockedfile-use-current-version.patch
+Patch2:		qtlockedfile-install.patch
 URL:		http://doc.qt.digia.com/solutions/4/qtlockedfile/qtlockedfile.html
 BuildRequires:	libstdc++-devel
 %if %{with qt4}
@@ -42,17 +44,30 @@ access the same file, QtLockedFile can be used to easily ensure that
 only one process at a time is writing to the file, and that no process
 is writing to it while others are reading it.
 
+%description -l pl.UTF-8
+Ta klasa rozszerza klasę QFile o możliwość międzyprocesowego
+blokowania plików. Jeśli aplikacja wymaga, aby różne procesy miały
+dostęp do tego samego pliku, QtLockedFile może pomóc łatwo zapewnić,
+że tylko jeden proces naraz zapisuje do pliku i żaden proces nie
+zapisuje, kiedy inne go czytają.
+
 %package devel
 Summary:	Development files for QtLockedFile library
+Summary(pl.UTF-8):	Pliki programistyczne biblioteki QtLockedFile
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
-This package contains libraries and header files for developing
-applications that use QtLockedFile.
+This package contains header files for developing applications that
+use QtLockedFile.
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
+wykorzystujących QtLockedFile.
 
 %package -n Qt5LockedFile
 Summary:	QFile extension with advisory locking functions
+Summary(pl.UTF-8):	Rozszerzenie QFile z funkcjami do blokowania doradczego
 Group:		Libraries
 
 %description -n Qt5LockedFile
@@ -62,8 +77,16 @@ access the same file, QtLockedFile can be used to easily ensure that
 only one process at a time is writing to the file, and that no process
 is writing to it while others are reading it.
 
+%description -n Qt5LockedFile -l pl.UTF-8
+Ta klasa rozszerza klasę QFile o możliwość międzyprocesowego
+blokowania plików. Jeśli aplikacja wymaga, aby różne procesy miały
+dostęp do tego samego pliku, QtLockedFile może pomóc łatwo zapewnić,
+że tylko jeden proces naraz zapisuje do pliku i żaden proces nie
+zapisuje, kiedy inne go czytają.
+
 %package -n Qt5LockedFile-devel
 Summary:	Development files for Qt5LockedFile library
+Summary(pl.UTF-8):	Pliki programistyczne biblioteki QtLockedFile
 Group:		Development/Libraries
 Requires:	Qt5LockedFile = %{version}-%{release}
 
@@ -71,30 +94,40 @@ Requires:	Qt5LockedFile = %{version}-%{release}
 This package contains libraries and header files for developing
 applications that use Qt5LockedFile.
 
+%description -n Qt5LockedFile-devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
+wykorzystujących QtLockedFile.
+
 %prep
 %setup -qc
 %patch0 -p1
 %patch1 -p0
-
-set -- *
-install -d build-qt{4,5}
-cp -al "$@" build-qt4
-cp -al "$@" build-qt5
+%patch2 -p1
 
 %build
-%if %{with qt4}
-cd build-qt4
 # Does not use GNU configure
 ./configure -library
-qmake-qt4
+
+%if %{with qt4}
+install -d build-qt4
+cd build-qt4
+qmake-qt4 ../qtlockedfile.pro \
+	QMAKE_CXX="%{__cxx}" \
+	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
+	QMAKE_LFLAGS_RELEASE="%{rpmldflags}" \
+	INSTALL_LIBDIR=%{_libdir}
 %{__make}
 cd ..
 %endif
 
 %if %{with qt5}
+install -d build-qt5
 cd build-qt5
-./configure -library
-qmake-qt5
+qmake-qt5 ../qtlockedfile.pro \
+	QMAKE_CXX="%{__cxx}" \
+	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
+	QMAKE_LFLAGS_RELEASE="%{rpmldflags}" \
+	INSTALL_LIBDIR=%{_libdir}
 %{__make}
 cd ..
 %endif
@@ -103,23 +136,23 @@ cd ..
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with qt4}
-cd build-qt4
-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*-%{version}.so.1.0
+%{__make} -C build-qt4 install \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT{%{_includedir}/qt4/QtSolutions,%{qt4dir}/mkspecs/features}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*-%{version}.so.1.0
 cp -p src/qtlockedfile.h src/QtLockedFile $RPM_BUILD_ROOT%{_includedir}/qt4/QtSolutions
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{qt4dir}/mkspecs/features
-cd ..
 %endif
 
 %if %{with qt5}
-cd build-qt5
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/qt5/QtSolutions,%{qt5dir}/mkspecs/features}
-cp -a lib/* $RPM_BUILD_ROOT%{_libdir}
-rm $RPM_BUILD_ROOT%{_libdir}/lib*-%{version}.so.1.0
+%{__make} -C build-qt5 install \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT{%{_includedir}/qt5/QtSolutions,%{qt5dir}/mkspecs/features}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*-%{version}.so.1.0
 cp -p src/qtlockedfile.h src/QtLockedFile $RPM_BUILD_ROOT%{_includedir}/qt5/QtSolutions
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{qt5dir}/mkspecs/features
-cd ..
 %endif
 
 %clean
@@ -141,7 +174,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc doc example
-%{_libdir}/libQtSolutions_LockedFile-%{version}.so
+%attr(755,root,root) %{_libdir}/libQtSolutions_LockedFile-%{version}.so
 # XXX shared dir
 %dir %{_includedir}/qt4/QtSolutions
 %{_includedir}/qt4/QtSolutions/QtLockedFile
@@ -159,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n Qt5LockedFile-devel
 %defattr(644,root,root,755)
 %doc doc example
-%{_libdir}/libQt5Solutions_LockedFile-%{version}.so
+%attr(755,root,root) %{_libdir}/libQt5Solutions_LockedFile-%{version}.so
 # XXX shared dir
 %dir %{_includedir}/qt5/QtSolutions
 %{_includedir}/qt5/QtSolutions/QtLockedFile
diff --git a/qtlockedfile-install.patch b/qtlockedfile-install.patch
new file mode 100644
index 0000000..b6c66d0
--- /dev/null
+++ b/qtlockedfile-install.patch
@@ -0,0 +1,16 @@
+--- QtLockedFile-2.4/buildlib/buildlib.pro.orig	2015-02-22 20:04:08.000000000 +0100
++++ QtLockedFile-2.4/buildlib/buildlib.pro	2018-12-31 16:49:24.654850751 +0100
+@@ -5,9 +5,12 @@
+ include(../src/qtlockedfile.pri)
+ TARGET = $$QTLOCKEDFILE_LIBNAME
+ DESTDIR = $$QTLOCKEDFILE_LIBDIR
++isEmpty(INSTALL_LIBDIR) {
++  INSTALL_LIBDIR = $$QTLOCKEDFILE_LIBDIR
++}
+ win32 {
+     DLLDESTDIR = $$[QT_INSTALL_BINS]
+     QMAKE_DISTCLEAN += $$[QT_INSTALL_BINS]\\$${QTLOCKEDFILE_LIBNAME}.dll
+ }
+-target.path = $$DESTDIR
++target.path = $$INSTALL_LIBDIR
+ INSTALLS += target
diff --git a/qtlockedfile-use-current-version.patch b/qtlockedfile-use-current-version.patch
index 5bd872b..c0c0e9f 100644
--- a/qtlockedfile-use-current-version.patch
+++ b/qtlockedfile-use-current-version.patch
@@ -1,10 +1,14 @@
 --- common.pri.old      2014-08-14 15:56:14.219803957 +0200
 +++ common.pri  2014-08-14 15:55:39.936478782 +0200
-@@ -1,6 +1,6 @@
+@@ -1,6 +1,10 @@
  exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtlockedfile-uselib
  TEMPLATE += fakelib
 -QTLOCKEDFILE_LIBNAME = $$qtLibraryTarget(QtSolutions_LockedFile-head)
++greaterThan(QT_MAJOR_VERSION, 4) {
++QTLOCKEDFILE_LIBNAME = $$qtLibraryTarget(Qt$${QT_MAJOR_VERSION}Solutions_LockedFile-2.4)
++} else {
 +QTLOCKEDFILE_LIBNAME = $$qtLibraryTarget(QtSolutions_LockedFile-2.4)
++}
  TEMPLATE -= fakelib
  QTLOCKEDFILE_LIBDIR = $$PWD/lib
  unix:qtlockedfile-uselib:!qtlockedfile-buildlib:QMAKE_RPATHDIR += $$QTLOCKEDFILE_LIBDIR