[packages/snapd-glib] - updated to 1.64; build also -2 variants (libsoup3 based)

qboosh qboosh at pld-linux.org
Thu Jul 27 18:36:01 CEST 2023


commit 0127fadf734e23ef7beab9ceb147493170724ae4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jul 27 18:08:08 2023 +0200

    - updated to 1.64; build also -2 variants (libsoup3 based)

 snapd-glib.spec | 221 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 195 insertions(+), 26 deletions(-)
---
diff --git a/snapd-glib.spec b/snapd-glib.spec
index 9218b3d..f22014f 100644
--- a/snapd-glib.spec
+++ b/snapd-glib.spec
@@ -1,25 +1,28 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# API documentation
+%bcond_without	libsoup2	# libsoup 2.x based libraries (snapd-glib, snapd-qt5)
+%bcond_without	libsoup3	# libsoup 3.x based libraries (snapd-glib-2, snapd-qt5-2)
 %bcond_without	qt		# Qt/Qml bindings
 %bcond_without	static_libs	# static libraries
 #
 Summary:	Library to allow GLib based applications access to snapd
 Summary(pl.UTF-8):	Biblioteka umożliwiająca dostęp do snapd aplikacjom opartym na GLibie 
 Name:		snapd-glib
-Version:	1.60
-Release:	2
+Version:	1.64
+Release:	1
 License:	LGPL v2 or LGPL v3
 Group:		Libraries
 #Source0Download: https://github.com/snapcore/snapd-glib/releases
 Source0:	https://github.com/snapcore/snapd-glib/releases/download/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	f40afd4c1b9f8a124c99bac8148be85f
+# Source0-md5:	188526f02727bf4ae339be5eb7c53048
 URL:		https://github.com/snapcore/snapd-glib
 BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	glib2-devel >= 1:2.46
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	json-glib-devel >= 1.1.2
-BuildRequires:	libsoup-devel >= 2.32
+%{?with_libsoup2:BuildRequires:	libsoup-devel >= 2.32}
+%{?with_libsoup3:BuildRequires:	libsoup3-devel >= 3.0}
 BuildRequires:	meson >= 0.43.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
@@ -88,18 +91,6 @@ Vala API for snapd-glib library.
 %description -n vala-snapd-glib -l pl.UTF-8
 API języka Vala do biblioteki snapd-glib.
 
-%package apidocs
-Summary:	API documentation for snapd-glib library
-Summary(pl.UTF-8):	Dokumentacja API biblioteki snapd-glib
-Group:		Documentation
-BuildArch:	noarch
-
-%description apidocs
-API documentation for snapd-glib library.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API biblioteki snapd-glib.
-
 %package -n snapd-qt5
 Summary:	Library to allow Qt 5 based applications access to snapd
 Summary(pl.UTF-8):	Biblioteka umożliwiająca dostęp do snapd aplikacjom opartym na Qt 5
@@ -141,26 +132,146 @@ Static snapd-qt library.
 %description -n snapd-qt5-static -l pl.UTF-8
 Statyczna biblioteka snapd-qt.
 
+%package apidocs
+Summary:	API documentation for snapd-glib library
+Summary(pl.UTF-8):	Dokumentacja API biblioteki snapd-glib
+Group:		Documentation
+BuildArch:	noarch
+
+%description apidocs
+API documentation for snapd-glib library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki snapd-glib.
+
+%package 2
+Summary:	Library to allow GLib based applications access to snapd using libsoup3
+Summary(pl.UTF-8):	Biblioteka umożliwiająca dostęp do snapd przy użyciu libsoup3 aplikacjom opartym na GLibie
+Group:		Libraries
+Requires:	glib2 >= 1:2.46
+Requires:	json-glib >= 1.1.2
+Requires:	libsoup3 >= 3.0
+
+%description 2
+snapd-glib-2 is a library to allow GLib based applications access to
+snapd, the daemon that controls Snaps.
+
+%description 2 -l pl.UTF-8
+snapd-glib-2 to biblioteka pozwalająca na dostęp aplikacji opartych na
+GLibie do snapd - demona kontrolującego Snapy.
+
+%package 2-devel
+Summary:	Header files for snapd-glib-2 library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki snapd-glib-2
+Group:		Development/Libraries
+Requires:	%{name}-2 = %{version}-%{release}
+Requires:	glib2-devel >= 1:2.46
+Requires:	json-glib-devel >= 1.1.2
+Requires:	libsoup3-devel >= 3.0
+
+%description 2-devel
+Header files for snapd-glib-2 library.
+
+%description 2-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki snapd-glib-2.
+
+%package 2-static
+Summary:	Static snapd-glib-2 library
+Summary(pl.UTF-8):	Statyczna biblioteka snapd-glib-2
+Group:		Development/Libraries
+Requires:	%{name}-2-devel = %{version}-%{release}
+
+%description 2-static
+Static snapd-glib-2 library.
+
+%description 2-static -l pl.UTF-8
+Statyczna biblioteka snapd-glib-2.
+
+%package -n vala-snapd-glib-2
+Summary:	Vala API for snapd-glib-2 library
+Summary(pl.UTF-8):	API języka Vala do biblioteki snapd-glib-2
+Group:		Development/Libraries
+Requires:	%{name}-2-devel = %{version}-%{release}
+Requires:	vala
+BuildArch:	noarch
+
+%description -n vala-snapd-glib-2
+Vala API for snapd-glib-2 library.
+
+%description -n vala-snapd-glib-2 -l pl.UTF-8
+API języka Vala do biblioteki snapd-glib-2.
+
+%package -n snapd-qt5-2
+Summary:	Library to allow Qt 5 based applications access to snapd using libsoup3
+Summary(pl.UTF-8):	Biblioteka umożliwiająca dostęp do snapd aplikacjom opartym na Qt 5 przy użyciu libsoup3
+Group:		Libraries
+Requires:	%{name}-2 = %{version}-%{release}
+
+%description -n snapd-qt5-2
+snapd-qt-2 is a library to allow Qt based applications access to
+snapd, the daemon that controls Snaps.
+
+%description -n snapd-qt5-2 -l pl.UTF-8
+snapd-qt-2 to biblioteka pozwalająca na dostęp aplikacji opartych na
+Qt do snapd - demona kontrolującego Snapy.
+
+%package -n snapd-qt5-2-devel
+Summary:	Header files for snapd-qt-2 library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki snapd-qt-2
+Group:		Development/Libraries
+Requires:	%{name}-2-devel = %{version}-%{release}
+Requires:	Qt5Core-devel >= 5
+Requires:	Qt5Network-devel >= 5
+Requires:	snapd-qt5-2-devel = %{version}-%{release}
+
+%description -n snapd-qt5-2-devel
+Header files for snapd-qt-2 library.
+
+%description -n snapd-qt5-2-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki snapd-qt-2.
+
+%package -n snapd-qt5-2-static
+Summary:	Static snapd-qt-2 library
+Summary(pl.UTF-8):	Statyczna biblioteka snapd-qt-2
+Group:		Development/Libraries
+Requires:	snapd-qt5-2-devel = %{version}-%{release}
+
+%description -n snapd-qt5-2-static
+Static snapd-qt-2 library.
+
+%description -n snapd-qt5-2-static -l pl.UTF-8
+Statyczna biblioteka snapd-qt-2.
+
 %prep
 %setup -q
 
 %build
-%meson build \
+for kind in %{?with_libsoup2:soup2} %{?with_libsoup3:soup3} ; do
+%meson build-${kind} \
 	%{!?with_static_libs:--default-library=shared} \
 	%{!?with_apidocs:-Ddocs=false} \
 	%{!?with_qt:-Dqml-bindings=false} \
-	%{!?with_qt:-Dqt-bindings=false}
+	%{!?with_qt:-Dqt-bindings=false} \
+	$([ "$kind" = "soup2" ] && echo -Dsoup2=true)
 
-%ninja_build -C build
+%ninja_build -C build-${kind}
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%ninja_install -C build
+for kind in %{?with_libsoup2:soup2} %{?with_libsoup3:soup3} ; do
+%ninja_install -C build-${kind}
+done
 
 %if %{with qt} && %{with static_libs}
+%if %{with libsoup2}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/qt5/qml/Snapd/libSnapd.a
 %endif
+%if %{with libsoup3}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/qt5/qml/Snapd2/libSnapd2.a
+%endif
+%endif
 
 %{__rm} -r $RPM_BUILD_ROOT{%{_libexecdir},%{_datadir}}/installed-tests
 
@@ -173,6 +284,13 @@ rm -rf $RPM_BUILD_ROOT
 %post	-n snapd-qt5 -p /sbin/ldconfig
 %postun	-n snapd-qt5 -p /sbin/ldconfig
 
+%post	2 -p /sbin/ldconfig
+%postun	2 -p /sbin/ldconfig
+
+%post	-n snapd-qt5-2 -p /sbin/ldconfig
+%postun	-n snapd-qt5-2 -p /sbin/ldconfig
+
+%if %{with libsoup2}
 %files
 %defattr(644,root,root,755)
 %doc NEWS README.md
@@ -198,12 +316,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/snapd-glib.deps
 %{_datadir}/vala/vapi/snapd-glib.vapi
 
-%if %{with apidocs}
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/snapd-glib
-%endif
-
 %if %{with qt}
 %files -n snapd-qt5
 %defattr(644,root,root,755)
@@ -226,3 +338,60 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libsnapd-qt.a
 %endif
 %endif
+%endif
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/snapd-glib
+%endif
+
+%if %{with libsoup3}
+%files 2
+%defattr(644,root,root,755)
+%doc NEWS README.md
+%attr(755,root,root) %{_libdir}/libsnapd-glib-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsnapd-glib-2.so.1
+%{_libdir}/girepository-1.0/Snapd-2.typelib
+
+%files 2-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsnapd-glib-2.so
+%{_includedir}/snapd-glib-2
+%{_datadir}/gir-1.0/Snapd-2.gir
+%{_pkgconfigdir}/snapd-glib-2.pc
+
+%if %{with static_libs}
+%files 2-static
+%defattr(644,root,root,755)
+%{_libdir}/libsnapd-glib-2.a
+%endif
+
+%files -n vala-snapd-glib-2
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/snapd-glib-2.deps
+%{_datadir}/vala/vapi/snapd-glib-2.vapi
+
+%if %{with qt}
+%files -n snapd-qt5-2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsnapd-qt-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsnapd-qt-2.so.1
+%dir %{_libdir}/qt5/qml/Snapd2
+%attr(755,root,root) %{_libdir}/qt5/qml/Snapd2/libSnapd2.so
+%{_libdir}/qt5/qml/Snapd2/qmldir
+
+%files -n snapd-qt5-2-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsnapd-qt-2.so
+%{_includedir}/snapd-qt-2
+%{_pkgconfigdir}/snapd-qt-2.pc
+%{_libdir}/cmake/Snapd2
+
+%if %{with static_libs}
+%files -n snapd-qt5-2-static
+%defattr(644,root,root,755)
+%{_libdir}/libsnapd-qt-2.a
+%endif
+%endif
+%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/snapd-glib.git/commitdiff/0127fadf734e23ef7beab9ceb147493170724ae4



More information about the pld-cvs-commit mailing list