raphgro pushed to qtlockedfile (f21). "build for Qt5 (rhbz#1209260)"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Apr 26 17:41:04 UTC 2015 

>From 6d8e0c22b624f04d31d0f1aa14c28b8c54a4a8a7 Mon Sep 17 00:00:00 2001
From: Raphael Groner <projects.rg at smart.ms>
Date: Sun, 26 Apr 2015 16:18:51 +0200
Subject: build for Qt5 (rhbz#1209260)


diff --git a/.gitignore b/.gitignore
index 26b951f..273ae15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ qtlockedfile-2.4_1-opensource.tar.gz
 /LGPL_EXCEPTION
 /LICENSE.GPL3
 /LICENSE.LGPL
+/qtlockedfile-17b56547d6e0d9a06603231fe2384474f9144829.tar.gz
diff --git a/qtlockedfile.spec b/qtlockedfile.spec
index b6aac07..fb0136d 100644
--- a/qtlockedfile.spec
+++ b/qtlockedfile.spec
@@ -1,30 +1,23 @@
-%global commit fd22bee22274975c56f1c10d87ee9fd2c0818f83
-
-Summary:    QFile extension with advisory locking functions
-Name:       qtlockedfile
-Version:    2.4
-Release:    11%{?dist}
-Group:      System Environment/Libraries
-License:    GPLv3 or LGPLv2 with exceptions
-URL:        http://doc.qt.digia.com/solutions/4/qtlockedfile/qtlockedfile.html
-Source0:    https://qt.gitorious.org/qt-solutions/qt-solutions/archive/%{commit}.tar.gz
-# Proposed upstream in https://codereview.qt-project.org/#/c/92414/
-Source1:    qtlockedfile.prf
+%global commit	17b56547d6e0d9a06603231fe2384474f9144829
+
+Summary:	QFile extension with advisory locking functions
+Name:		qtlockedfile
+Version:	2.4
+Release:	10%{?dist}
+
+License:	GPLv3 or LGPLv2 with exceptions
+URL:		http://doc.qt.digia.com/solutions/4/qtlockedfile/qtlockedfile.html
+Source0:	https://qt.gitorious.org/qt-solutions/qt-solutions/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz
+Source1:	qtlockedfile.prf
 # Proposed upstream in https://codereview.qt-project.org/#/c/92411/
-Source2:    LICENSE.GPL3
+Source2:	LICENSE.LGPL
 # Proposed upstream in https://codereview.qt-project.org/#/c/92411/
-Source3:    LICENSE.LGPL
+Source3:	LGPL_EXCEPTION
 # Proposed upstream in https://codereview.qt-project.org/#/c/92411/
-Source4:    LGPL_EXCEPTION
-
-Patch0:     qtlockedfile-use-current-version.patch
-# Proposed upstream in https://codereview.qt-project.org/#/c/92413/
-Patch1:     qtlockedfile-dont-link-qtgui.patch
-Patch2:     qtlockedfile-dont-build-example.patch
+Source4:	LICENSE.GPL3
+Patch0:		qtlockedfile-dont-build-example.patch
 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  qt4-devel
-%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+BuildRequires:	qt4-devel qt5-qtbase-devel
 
 %description
 This class extends the QFile class with inter-process file locking capabilities.
@@ -33,57 +26,81 @@ 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.
 
-%package    devel
-Summary:    Development files for %{name}
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires:   qt4-devel
+%package devel
+Summary:	Development files for %{name}
+BuildArch:      noarch
+Requires:	%{name} = %{version}-%{release}
+Requires:	qt4-devel
 
-%description    devel
+%description devel
 This package contains libraries and header files for developing applications
 that use QtLockedFile.
 
+%package qt5
+Summary:	QFile extension with advisory locking functions (Qt5)
+Requires:       qt5-qtbase
+
+%description qt5
+This class extends the QFile class with inter-process file locking capabilities.
+If an application requires that several processes should 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.
+This is a special build against Qt5.
+
+%package qt5-devel
+Summary:        Development files for %{name}-qt5
+BuildArch:      noarch
+Requires:       %{name}-qt5 = %{version}-%{release}
+Requires:       qt5-qtbase-devel
+
+%description qt5-devel
+This package contains libraries and header files for developing applications
+that use QtLockedFile with Qt5.
+
+
 %prep
-%setup -q -n qt-solutions-qt-solutions/%{name}
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
+%setup -qnqt-solutions-qt-solutions/%{name}
+%patch0 -p1 -b .no-example
+sed -i s,head,%{version}, common.pri
+mkdir licenses
+cp %{SOURCE2} %{SOURCE3} %{SOURCE4} licenses
 
 
 %build
 # Does not use GNU configure
 ./configure -library
-%{_qt4_qmake}
+%{qmake_qt4}
+make %{?_smp_mflags}
+mkdir qt5
+pushd qt5
+%{qmake_qt5} ..
 make %{?_smp_mflags}
+popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # libraries
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-cp -a lib/* $RPM_BUILD_ROOT%{_libdir}
+mkdir -p %{buildroot}%{_libdir}
+cp -a lib/* %{buildroot}%{_libdir}
 
 # headers
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/QtSolutions
-cp -a \
+for qtdir in %{_qt4_headerdir} %{_qt5_headerdir} ; do
+ d=%{buildroot}$qtdir/QtSolutions ;
+ mkdir -p $d ;
+ cp -a \
     src/qtlockedfile.h \
     src/QtLockedFile \
-    $RPM_BUILD_ROOT%{_includedir}/QtSolutions
-
-mkdir -p $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features/
+    $d ;
+done
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp %{SOURCE3} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp %{SOURCE4} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
-cp %{SOURCE3} $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
-cp %{SOURCE4} $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
+for qtdir in %{_qt4_datadir} %{_qt5_datadir} ; do
+ d=%{buildroot}$qtdir/mkspecs/features ;
+ mkdir -p $d ;
+ cp -a %{SOURCE1} $d ;
+done 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -91,28 +108,42 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
+%license licenses/*
 %doc README.TXT
-%doc %{_docdir}/%{name}-%{version}
-%{_qt4_libdir}/lib*.so.*
+# Caution! do not include any unversioned .so symlink (belongs to -devel)
+%{_qt4_libdir}/libQtSolutions_LockedFile*.so.*
 
 %files devel
-%defattr(-,root,root,-)
-%doc doc example
-%doc %{_docdir}/%{name}-devel-%{version}
-%{_qt4_libdir}/lib*.so
+%doc doc/html/ example/
 %{_qt4_headerdir}/QtSolutions/
+%{_qt4_libdir}/libQtSolutions_LockedFile*.so
 %{_qt4_datadir}/mkspecs/features/%{name}.prf
 
-%changelog
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+%files qt5
+%license licenses/*
+%doc README.TXT
+# Caution! do not include any unversioned .so symlink (belongs to -devel)
+%{_qt5_libdir}/libQt5Solutions_LockedFile*.so.*
+
+%files qt5-devel
+%doc doc/html/ example/
+%{_qt5_headerdir}/QtSolutions/
+%{_qt5_libdir}/libQt5Solutions_LockedFile*.so
+%{_qt5_datadir}/mkspecs/features/%{name}.prf
 
-* Thu Aug 14 2014 Fabio Alessandro Locati <fabiolocati at gmail.com> - 2.4-10
-- Fix conflicting license files
 
-* Thu Aug 14 2014 Fabio Alessandro Locati <fabiolocati at gmail.com> - 2.4-9
-- Update to Digia's repository
+%changelog
+* Sat Apr 25 2015 Raphael Groner <projects.rg at smart.ms> - 2.4-10
+- add Qt5 build
+- switch to digia and gitorious
+- use latest commit of dedicated source folder
+- remove upstreamed patch
+- use noarch for devel subpackages
+- replace buildroot macro
+- remove deprecated spec entries
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 1e36df2..c5085b4 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@
 d48d97e7f8a2a60038b263713ce3651a  LGPL_EXCEPTION
 d32239bcb673463ab874e80d47fae504  LICENSE.GPL3
 4fbd65380cdd255951079008b364516c  LICENSE.LGPL
+d72df7978554b43db5226d09b3bb5933  qtlockedfile-17b56547d6e0d9a06603231fe2384474f9144829.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qtlockedfile.git/commit/?h=f21&id=6d8e0c22b624f04d31d0f1aa14c28b8c54a4a8a7

More information about the scm-commits mailing list