- gssdp updated to 1.6.2 as gssdp1.6 (libsoup3 based, parallel installable with libso...

- only gssdp-sniffer package built as replacement for 1.4.x version

diff --git a/gssdp.spec b/gssdp1.6.spec
similarity index 70%
rename from gssdp.spec
rename to gssdp1.6.spec
index 595b047b09a7dc170ef18422da1f571b0d42a938..734c1f29b95f49b8b22624af2c177be02da1ba9a 100644 (file)
--- a/gssdp.spec
+++ b/gssdp1.6.spec
@@ -2,24 +2,25 @@
 # Conditional build:
 %bcond_without apidocs # gi-docgen based API documentation
 %bcond_without vala    # Vala bindings
+%bcond_without sniffer # sniffer package (GUI)
 
 Summary:       GObject-based SSDP (Simple Service Discovery Protocol) library
 Summary(pl.UTF-8):     Biblioteka SSDP (Simple Service Discovery Protocol) oparta na GObject
-Name:          gssdp
-# note: 1.4.x is stable, 1.5.x unstable
-Version:       1.4.1
+Name:          gssdp1.6
+# note: 1.6.x is stable, 1.7.x unstable
+Version:       1.6.2
 Release:       1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       https://download.gnome.org/sources/gssdp/1.4/%{name}-%{version}.tar.xz
-# Source0-md5: 468514c096b6768a040e382de51fe85d
+Source0:       https://download.gnome.org/sources/gssdp/1.6/gssdp-%{version}.tar.xz
+# Source0-md5: 1d3c66a094a07175ccb87bbdfc2b6e93
 URL:           https://wiki.gnome.org/Projects/GUPnP
 BuildRequires: docbook-dtd412-xml
 %{?with_apidocs:BuildRequires: gi-docgen >= 2021.1}
-BuildRequires: glib2-devel >= 1:2.54
+BuildRequires: glib2-devel >= 1:2.69
 BuildRequires: gobject-introspection-devel >= 1.36.0
-BuildRequires: gtk4-devel >= 4
-BuildRequires: libsoup-devel >= 2.26.1
+%{?with_sniffer:BuildRequires: gtk4-devel >= 4}
+BuildRequires: libsoup3-devel >= 3.0
 BuildRequires: meson >= 0.54.0
 BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
@@ -28,8 +29,8 @@ BuildRequires:        rpmbuild(macros) >= 1.736
 BuildRequires: tar >= 1:1.22
 %{?with_vala:BuildRequires:    vala >= 2:0.20}
 BuildRequires: xz
-Requires:      glib2 >= 1:2.54
-Requires:      libsoup >= 2.26.1
+Requires:      glib2 >= 1:2.69
+Requires:      libsoup3 >= 3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,26 +42,13 @@ GSSDP to oparte na bibliotece GObject API implementujące wykrywanie i
 rozgłaszanie zasobów przy użyciu protokołu SSDP (Simple Service
 Discovery Protocol).
 
-%package sniffer
-Summary:       Graphical SSDP sniffer
-Summary(pl.UTF-8):     Graficzny sniffer SSDP
-Group:         X11/Applications/Networking
-Requires:      %{name} = %{version}-%{release}
-Requires:      gtk4 >= 4
-
-%description sniffer
-Graphical SSDP sniffer.
-
-%description sniffer -l pl.UTF-8
-Graficzny sniffer SSDP.
-
 %package devel
 Summary:       Header files for GSSDP
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki GSSDP
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.54
-Requires:      libsoup-devel >= 2.26.1
+Requires:      glib2-devel >= 1:2.69
+Requires:      libsoup3-devel >= 3.0
 
 %description devel
 This package contains header files for GSSDP library.
@@ -93,7 +81,7 @@ GSSDP API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API GSSDP.
 
-%package -n vala-gssdp
+%package -n vala-gssdp1.6
 Summary:       Vala binding for GSSDP library
 Summary(pl.UTF-8):     Wiązanie języka Vala do biblioteki GSSDP
 Group:         Development/Libraries
@@ -101,18 +89,32 @@ Requires:  %{name}-devel = %{version}-%{release}
 Requires:      vala >= 2:0.20
 BuildArch:     noarch
 
-%description -n vala-gssdp
+%description -n vala-gssdp1.6
 Vala binding for GSSDP library.
 
-%description -n vala-gssdp -l pl.UTF-8
+%description -n vala-gssdp1.6 -l pl.UTF-8
 Wiązanie języka Vala do biblioteki GSSDP.
 
+%package -n gssdp-sniffer
+Summary:       Graphical SSDP sniffer
+Summary(pl.UTF-8):     Graficzny sniffer SSDP
+Group:         X11/Applications/Networking
+Requires:      %{name} = %{version}-%{release}
+Requires:      gtk4 >= 4
+
+%description -n gssdp-sniffer
+Graphical SSDP sniffer.
+
+%description -n gssdp-sniffer -l pl.UTF-8
+Graficzny sniffer SSDP.
+
 %prep
-%setup -q
+%setup -q -n gssdp-%{version}
 
 %build
 %meson build \
-       %{?with_apidocs:-Dgtk_doc=true}
+       %{?with_apidocs:-Dgtk_doc=true} \
+       %{!?with_sniffer:-Dsniffer=false}
 
 %ninja_build -C build
 
@@ -124,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 # FIXME: where to package gi-docgen generated docs?
 install -d $RPM_BUILD_ROOT%{_gtkdocdir}
-%{__mv} $RPM_BUILD_ROOT%{_docdir}/gssdp-1.2 $RPM_BUILD_ROOT%{_gtkdocdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/gssdp-1.6 $RPM_BUILD_ROOT%{_gtkdocdir}
 %endif
 
 %clean
@@ -136,34 +138,37 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README.md
-%attr(755,root,root) %{_libdir}/libgssdp-1.2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgssdp-1.2.so.0
-%{_libdir}/girepository-1.0/GSSDP-1.2.typelib
-
-%files sniffer
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gssdp-device-sniffer
+%attr(755,root,root) %{_libdir}/libgssdp-1.6.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgssdp-1.6.so.0
+%{_libdir}/girepository-1.0/GSSDP-1.6.typelib
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgssdp-1.2.so
-%{_datadir}/gir-1.0/GSSDP-1.2.gir
-%{_includedir}/gssdp-1.2
-%{_pkgconfigdir}/gssdp-1.2.pc
+%attr(755,root,root) %{_libdir}/libgssdp-1.6.so
+%{_datadir}/gir-1.0/GSSDP-1.6.gir
+%{_includedir}/gssdp-1.6
+%{_pkgconfigdir}/gssdp-1.6.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libgssdp-1.2.a
+%{_libdir}/libgssdp-1.6.a
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/gssdp-1.2
+%{_gtkdocdir}/gssdp-1.6
 %endif
 
 %if %{with vala}
-%files -n vala-gssdp
+%files -n vala-gssdp1.6
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/gssdp-1.6.deps
+%{_datadir}/vala/vapi/gssdp-1.6.vapi
+%endif
+
+%if %{with sniffer}
+%files -n gssdp-sniffer
 %defattr(644,root,root,755)
-%{_datadir}/vala/vapi/gssdp-1.2.deps
-%{_datadir}/vala/vapi/gssdp-1.2.vapi
+%attr(755,root,root) %{_bindir}/gssdp-device-sniffer
+%{_mandir}/man1/gssdp-device-sniffer.1*
 %endif