[packages/libaccounts-qt] - added libaccounts-qt5* packages

qboosh qboosh at pld-linux.org
Wed Feb 26 13:01:02 CET 2014


commit 1c213fd513d771c32b9bfc3adf612fac9d8a9fc4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Feb 26 13:03:28 2014 +0100

    - added libaccounts-qt5* packages

 libaccounts-qt.spec | 113 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 96 insertions(+), 17 deletions(-)
---
diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec
index be559ea..7d202b4 100644
--- a/libaccounts-qt.spec
+++ b/libaccounts-qt.spec
@@ -1,4 +1,8 @@
-# TODO: qt5 version as libaccounts-qt5-*?
+#
+# Conditional build:
+%bcond_without	qt4	# Qt 4 version
+%bcond_without	qt5	# Qt 5 version
+#
 Summary:	Accounts management library for Qt 4 applications
 Summary(pl.UTF-8):	Biblioteka do zarządzania kontami dla aplikacji opartych na bibliotece Qt 4
 Name:		libaccounts-qt
@@ -10,15 +14,20 @@ Group:		Libraries
 Source0:	http://accounts-sso.googlecode.com/files/accounts-qt-%{version}.tar.bz2
 # Source0-md5:	a76f26849603f229399dc46eb83ed5a8
 URL:		http://code.google.com/p/accounts-sso/
-BuildRequires:	QtCore-devel >= 4
-BuildRequires:	QtTest-devel >= 4
-BuildRequires:	QtXml-devel >= 4
+%{?with_qt4:BuildRequires:	QtCore-devel >= 4}
+%{?with_qt4:BuildRequires:	QtTest-devel >= 4}
+%{?with_qt4:BuildRequires:	QtXml-devel >= 4}
+%{?with_qt5:BuildRequires:	Qt5Core-devel >= 5}
+%{?with_qt5:BuildRequires:	Qt5Test-devel >= 5}
+%{?with_qt5:BuildRequires:	Qt5Xml-devel >= 5}
 BuildRequires:	doxygen
 BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	libaccounts-glib-devel
 BuildRequires:	pkgconfig
-BuildRequires:	qt4-build >= 4
-BuildRequires:	qt4-qmake >= 4
+%{?with_qt4:BuildRequires:	qt4-build >= 4}
+%{?with_qt4:BuildRequires:	qt4-qmake >= 4}
+%{?with_qt5:BuildRequires:	qt5-build >= 5}
+%{?with_qt5:BuildRequires:	qt5-qmake >= 5}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,17 +52,32 @@ Development files for libaccounts-qt library.
 %description devel -l pl.UTF-8
 Pliki programistyczne biblioteki libaccounts-qt.
 
-%package static
-Summary:	Static libaccounts-qt library
-Summary(pl.UTF-8):	Statyczna biblioteka libaccounts-qt
+%package -n libaccounts-qt5
+Summary:	Accounts management library for Qt 5 applications
+Summary(pl.UTF-8):	Biblioteka do zarządzania kontami dla aplikacji opartych na bibliotece Qt 5
+Group:		Libraries
+
+%description -n libaccounts-qt5
+This project is a library for managing accounts which can be used from
+Qt 5 applications. It is part of the accounts-sso project.
+
+%description -n libaccounts-qt5 -l pl.UTF-8
+Ten projekt to biblioteka do zarządzania kontami, z której można
+korzystać w aplikacjach opartych na bibliotece Qt 5. Jest to część
+projektu accounts-sso.
+
+%package -n libaccounts-qt5-devel
+Summary:	Development files for libaccounts-qt5 library
+Summary(pl.UTF-8):	Pliki programistyczne biblioteki libaccounts-qt5
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
+Requires:	libaccounts-qt5 = %{version}-%{release}
+Requires:	Qt5Core-devel >= 5
 
-%description static
-Static libaccounts-qt library.
+%description -n libaccounts-qt5-devel
+Development files for libaccounts-qt5 library.
 
-%description static -l pl.UTF-8
-Statyczna biblioteka libaccounts-qt.
+%description -n libaccounts-qt5-devel -l pl.UTF-8
+Pliki programistyczne biblioteki libaccounts-qt5.
 
 %package apidocs
 Summary:	API documentation for libaccounts-qt library
@@ -70,24 +94,60 @@ Dokumentacja API biblioteki libaccounts-qt.
 %setup -q -n accounts-qt-%{version}
 
 # clean
-%{__rm} Accounts/libaccounts-qt5.so*
+%{__rm} Accounts/{libaccounts-qt5.so*,*.cmake}
 
 %build
-qmake-qt4 accounts-qt.pro \
+
+%if %{with qt4}
+install -d build-qt4
+cd build-qt4
+qmake-qt4 ../accounts-qt.pro \
+	BUILD_DIR=build-qt4 \
+	QMAKE_CXX="%{__cxx}" \
+	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
+	QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
+
+%{__make}
+cd ..
+%endif
+
+%if %{with qt5}
+install -d build-qt5
+cd build-qt5
+qmake-qt5 ../accounts-qt.pro \
+	BUILD_DIR=build-qt5 \
 	QMAKE_CXX="%{__cxx}" \
 	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
 	QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
 
 %{__make}
+cd ..
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%if %{with qt5}
+%{__make} -C build-qt5 install \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+
+# useless symlink
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libaccounts-qt5.so.1.?
+
+# separate from qt4 version
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/cmake/{AccountsQt,AccountsQt5}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/cmake/AccountsQt5/{AccountsQt,AccountsQt5}Config.cmake
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/cmake/AccountsQt5/{AccountsQt,AccountsQt5}ConfigVersion.cmake
+%endif
+
+%if %{with qt4}
+%{__make} -C build-qt4 install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # useless symlink
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libaccounts-qt.so.1.?
+%endif
+
 # test suite
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/accountstest
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/libaccounts-qt-tests
@@ -100,6 +160,10 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%post	-n libaccounts-qt5 -p /sbin/ldconfig
+%postun	-n libaccounts-qt5 -p /sbin/ldconfig
+
+%if %{with qt4}
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libaccounts-qt.so.*.*.*
@@ -111,6 +175,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/accounts-qt
 %{_pkgconfigdir}/accounts-qt.pc
 %{_libdir}/cmake/AccountsQt
+%endif
+
+%if %{with qt5}
+%files -n libaccounts-qt5
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libaccounts-qt5.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libaccounts-qt5.so.1
+
+%files -n libaccounts-qt5-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libaccounts-qt5.so
+%{_includedir}/accounts-qt5
+%{_pkgconfigdir}/accounts-qt5.pc
+%{_libdir}/cmake/AccountsQt5
+%endif
 
 %files apidocs
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libaccounts-qt.git/commitdiff/1c213fd513d771c32b9bfc3adf612fac9d8a9fc4



More information about the pld-cvs-commit mailing list