[packages/signon] - updated to snapshot of 8.62 (fragments of spec copied from OpenMandriva) - changed URL

witekfl witekfl at pld-linux.org
Fri Feb 9 17:15:03 CET 2024 

commit 2b35f114cdd7f063880d78f7de90b2eb195d0e33
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Fri Feb 9 16:39:38 2024 +0100

    - updated to snapshot of 8.62 (fragments of spec copied from OpenMandriva)
    - changed URL

 signon.spec | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 127 insertions(+), 24 deletions(-)
---
diff --git a/signon.spec b/signon.spec
index cff1484..27f191f 100644
--- a/signon.spec
+++ b/signon.spec
@@ -1,22 +1,29 @@
 #
 # Conditional build:
 %bcond_with	cryptsetup		# cryptsetup support
+%bcond_without	qt5			# qt5 version
+%bcond_without	qt6			# qt6 version
+
+%define snapshot 20240113
 #
 Summary:	Single Sign On libraries and daemon
 Summary(pl.UTF-8):	Biblioteki i demon Single Sign On
 Name:		signon
-Version:	8.60
-Release:	1
+Version:	8.62
+Release:	1.%{snapshot}
 License:	LGPL v2.1
 Group:		Libraries
-#Source0Download: https://gitlab.com/accounts-sso/signond/tags
-Source0:	https://gitlab.com/accounts-sso/signond/-/archive/VERSION_%{version}/signond-VERSION_%{version}.tar.bz2
-# Source0-md5:	2b3112b725348e5e75abf7288692976c
+# Original version: https://gitlab.com/accounts-sso/signond
+# But the fork is better and more actively maintained.
+#Source0Download: https://gitlab.com/nicolasfella/signond/tags
+Source0:	https://gitlab.com/nicolasfella/signond/-/archive/qt6/signond-qt6.tar.bz2
+# Source0-md5:	af002cbaf35c77d751c484ac1c8b0206
 # submodule
 Source1:	https://gitlab.com/accounts-sso/signon-dbus-specification/-/archive/67487954653006ebd0743188342df65342dc8f9b/signon-dbus-specification-67487954653006ebd0743188342df65342dc8f9b.tar.bz2
 # Source1-md5:	21f2a3bf51a6c7eb6f74a2d3c776fcb9
 Patch0:		%{name}-cryptsetup.patch
-URL:		https://gitlab.com/accounts-sso/signond
+URL:		https://gitlab.com/nicolasfella/signond
+%if %{with qt5}
 BuildRequires:	Qt5Core-devel >= 5
 BuildRequires:	Qt5DBus-devel >= 5
 BuildRequires:	Qt5Gui-devel >= 5
@@ -24,13 +31,25 @@ BuildRequires:	Qt5Network-devel >= 5
 BuildRequires:	Qt5Sql-devel >= 5
 BuildRequires:	Qt5Test-devel >= 5
 BuildRequires:	Qt5Xml-devel >= 5
+BuildRequires:	qt5-build >= 5
+BuildRequires:	qt5-qmake >= 5
+%endif
+%if %{with qt6}
+BuildRequires:	Qt6Core-devel >= 5
+BuildRequires:	Qt6DBus-devel >= 5
+BuildRequires:	Qt6Gui-devel >= 5
+BuildRequires:	Qt6Network-devel >= 5
+BuildRequires:	Qt6Sql-devel >= 5
+BuildRequires:	Qt6Test-devel >= 5
+BuildRequires:	Qt6Xml-devel >= 5
+BuildRequires:	qt6-build >= 5
+BuildRequires:	qt6-qmake >= 5
+%endif
 %{?with_cryptsetup:BuildRequires:	cryptsetup-devel}
 BuildRequires:	doxygen
 BuildRequires:	libproxy-devel
 BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	pkgconfig
-BuildRequires:	qt5-build >= 5
-BuildRequires:	qt5-qmake >= 5
 BuildRequires:	tar >= 1:1.22
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -129,8 +148,45 @@ Static libsignon-qt5 library.
 %description -n libsignon-qt5-static -l pl.UTF-8
 Statyczna biblioteka libsignon-qt5.
 
+%package -n libsignon-qt6
+Summary:	Client library for the Single Sign On daemon - Qt 6 bindings
+Summary(pl.UTF-8):	Biblioteka kliencka demona Single Sign On - wiązania Qt 6
+Group:		Libraries
+
+%description -n libsignon-qt6
+Client library for the Single Sign On daemon - Qt 6 bindings.
+
+%description -n libsignon-qt6 -l pl.UTF-8
+Biblioteka kliencka demona Single Sign On - wiązania Qt 6.
+
+%package -n libsignon-qt6-devel
+Summary:	Header files for Single Sign On daemon Qt 6 client library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki klienckiej Qt 6 demona Single Sign On
+Group:		Development/Libraries
+Requires:	Qt6Core-devel >= 6
+Requires:	libsignon-qt6 = %{version}-%{release}
+
+%description -n libsignon-qt6-devel
+Header files for Single Sign On daemon Qt 6 client library.
+
+%description -n libsignon-qt6-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki klienckiej Qt 6 demona Single Sign On.
+
+%package -n libsignon-qt6-static
+Summary:	Static libsignon-qt6 library
+Summary(pl.UTF-8):	Statyczna biblioteka libsignon-qt6
+Group:		Development/Libraries
+Requires:	libsignon-qt6-devel = %{version}-%{release}
+
+%description -n libsignon-qt6-static
+Static libsignon-qt6 library.
+
+%description -n libsignon-qt6-static -l pl.UTF-8
+Statyczna biblioteka libsignon-qt6.
+
+
 %prep
-%setup -q -n signond-VERSION_%{version}
+%setup -q -n signond-qt6
 tar xf %{SOURCE1} -C lib/signond/interfaces --strip-components 1
 %patch0 -p1
 
@@ -138,12 +194,15 @@ tar xf %{SOURCE1} -C lib/signond/interfaces --strip-components 1
 %{__sed} -i -e '/GENERATE_QHP/ s/YES/NO/' doc/doxy.conf
 %{__sed} -i -e '/doc\/qch/d' doc/doc.pri
 
+mkdir qt5
+mv $(ls -1 |grep -vE '^qt5$') .* qt5/
+cp -a qt5 qt6
+
 %build
-install -d build-qt5
-cd build-qt5
-qmake-qt5 ../signon.pro \
+%if %{with qt5}
+cd qt5
+qmake-qt5 signon.pro \
 	%{?with_cryptsetup:CONFIG+=cryptsetup} \
-	BUILD_DIR="build-qt5" \
 	LIBDIR="%{_libdir}" \
 	QMAKE_CXX="%{__cxx}" \
 	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
@@ -151,15 +210,36 @@ qmake-qt5 ../signon.pro \
 
 %{__make}
 cd ..
+%endif
+
+%if %{with qt6}
+cd qt6
+qmake-qt6 signon.pro \
+	%{?with_cryptsetup:CONFIG+=cryptsetup} \
+	LIBDIR="%{_libdir}" \
+	QMAKE_CXX="%{__cxx}" \
+	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
+	QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
+
+%{__make}
+cd ..
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C build-qt5 install \
+%if %{with qt5}
+%{__make} -C qt5 install \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+%endif
+
+%if %{with qt6}
+%{__make} -C qt6 install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
+%endif
 
 # useless symlinks
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.so.1.?
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.so.1.?
 
 install -d $RPM_BUILD_ROOT%{_docdir}/signon-apidocs-%{version} \
 	$RPM_BUILD_ROOT%{_examplesdir}/signon-%{version}
@@ -177,9 +257,12 @@ rm -rf $RPM_BUILD_ROOT
 %post	-n libsignon-qt5 -p /sbin/ldconfig
 %postun	-n libsignon-qt5 -p /sbin/ldconfig
 
+%post	-n libsignon-qt6 -p /sbin/ldconfig
+%postun	-n libsignon-qt6 -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc README.md
+%doc qt5/README.md
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/signond.conf
 %attr(755,root,root) %{_bindir}/signond
 %attr(755,root,root) %{_bindir}/signonpluginprocess
@@ -198,17 +281,17 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsignon-extension.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsignon-extension.so.1
+%ghost %{_libdir}/libsignon-extension.so.1
 %attr(755,root,root) %{_libdir}/libsignon-plugins.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsignon-plugins.so.1
+%ghost %{_libdir}/libsignon-plugins.so.1
 %attr(755,root,root) %{_libdir}/libsignon-plugins-common.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsignon-plugins-common.so.1
+%ghost %{_libdir}/libsignon-plugins-common.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsignon-extension.so
-%attr(755,root,root) %{_libdir}/libsignon-plugins.so
-%attr(755,root,root) %{_libdir}/libsignon-plugins-common.so
+%{_libdir}/libsignon-extension.so
+%{_libdir}/libsignon-plugins.so
+%{_libdir}/libsignon-plugins-common.so
 %{_includedir}/signon-extension
 %{_includedir}/signon-plugins
 %{_includedir}/signond
@@ -229,14 +312,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_docdir}/libsignon-qt-apidocs-%{version}
 
+%if %{with qt5}
 %files -n libsignon-qt5
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsignon-qt5.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsignon-qt5.so.1
+%ghost %{_libdir}/libsignon-qt5.so.1
 
 %files -n libsignon-qt5-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsignon-qt5.so
+%{_libdir}/libsignon-qt5.so
 %{_includedir}/signon-qt5
 %{_pkgconfigdir}/libsignon-qt5.pc
 %{_libdir}/cmake/SignOnQt5
@@ -244,3 +328,22 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libsignon-qt5-static
 %defattr(644,root,root,755)
 %{_libdir}/libsignon-qt5.a
+%endif
+
+%if %{with qt6}
+%files -n libsignon-qt6
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsignon-qt6.so.*.*.*
+%ghost %{_libdir}/libsignon-qt6.so.1
+
+%files -n libsignon-qt6-devel
+%defattr(644,root,root,755)
+%{_libdir}/libsignon-qt6.so
+%{_includedir}/signon-qt6
+%{_pkgconfigdir}/libsignon-qt6.pc
+%{_libdir}/cmake/SignOnQt6
+
+%files -n libsignon-qt6-static
+%defattr(644,root,root,755)
+%{_libdir}/libsignon-qt6.a
+%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/signon.git/commitdiff/2b35f114cdd7f063880d78f7de90b2eb195d0e33

More information about the pld-cvs-commit mailing list