diff --git a/gupnp-1.4.2-revert-man-page.patch b/gupnp-1.4.2-revert-man-page.patch deleted file mode 100644 index 0130f86..0000000 --- a/gupnp-1.4.2-revert-man-page.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dbc32a55e265814a83cea7c1254d85f51f99b54b Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Tue, 4 Jan 2022 15:05:14 +0100 -Subject: [PATCH] Revert "build: Do not write man page during test" - -This reverts commit 79a2cb24cd0079e9a025809d11dce13edce68bdd. - -Does not work, will exit xsltproc with an error as if the file was not -writeable ---- - doc/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/doc/meson.build b/doc/meson.build -index de94aa2..2fd0106 100644 ---- a/doc/meson.build -+++ b/doc/meson.build -@@ -66,7 +66,6 @@ if xsltproc.found() - xsltproc, - xlstproc_flags, - '--noout', -- '--nowrite', - stylesheet, - 'gupnp-binding-tool.xml' - ] --- -2.33.1 - diff --git a/gupnp-1.4.3.tar.xz b/gupnp-1.4.3.tar.xz deleted file mode 100644 index 3306e46..0000000 Binary files a/gupnp-1.4.3.tar.xz and /dev/null differ diff --git a/gupnp-1.6.4.tar.xz b/gupnp-1.6.4.tar.xz new file mode 100644 index 0000000..39e840b Binary files /dev/null and b/gupnp-1.6.4.tar.xz differ diff --git a/gupnp.spec b/gupnp.spec index 6a45b69..f6a37ea 100644 --- a/gupnp.spec +++ b/gupnp.spec @@ -1,18 +1,16 @@ -%global apiver 1.2 -%global gssdp_version 1.3.0 +%global apiver 1.6 +%global gssdp_version 1.6.2 Name: gupnp -Version: 1.4.3 -Release: 2 +Version: 1.6.4 +Release: 1 Summary: UPnP devices & control points creation framework License: LGPLv2+ URL: https://www.gupnp.org/ -Source0: https://download.gnome.org/sources/%{name}/1.4/%{name}-%{version}.tar.xz -Patch0: gupnp-1.4.2-revert-man-page.patch -Patch1: linux-cm-Fix-IFA_FLAGS-detection.patch +Source0: https://download.gnome.org/sources/%{name}/1.6/%{name}-%{version}.tar.xz BuildRequires: gssdp-devel >= %{gssdp_version} gtk-doc gobject-introspection-devel docbook-style-xsl -BuildRequires: libsoup-devel libxml2-devel libuuid-devel vala meson +BuildRequires: libsoup-devel libxml2-devel libuuid-devel vala meson cmake gi-docgen Requires: dbus Requires: gssdp%{?_isa} >= %{gssdp_version} @@ -54,6 +52,8 @@ This package contains help file and developer documentation for gupnp. %meson_install %delete_la +cp %{_libdir}/libgupnp-1.2.so.* %{buildroot}%{_libdir}/ + %check %meson_test @@ -62,24 +62,29 @@ This package contains help file and developer documentation for gupnp. %postun -p /sbin/ldconfig %files -%license COPYING -%{_libdir}/libgupnp-%{apiver}.so.1* +%license COPYING +%{_libdir}/libgupnp-%{apiver}.so.0* +%{_libdir}/libgupnp-1.2.so.1* %{_libdir}/girepository-1.0/GUPnP-%{apiver}.typelib %files devel %{_bindir}/gupnp-binding-tool-%{apiver} %{_includedir}/gupnp-%{apiver}/ %{_libdir}/libgupnp-%{apiver}.so +%{_libdir}/libgupnp-1.2.so.1 %{_libdir}/pkgconfig/gupnp-%{apiver}.pc %{_datadir}/gir-1.0/GUPnP-%{apiver}.gir %{_datadir}/vala/vapi/gupnp* %files help %doc AUTHORS README.md -%doc %{_datadir}/gtk-doc/html/gupnp %{_mandir}/man1/gupnp-binding-tool-* +%{_docdir}/gupnp-%{apiver}/ %changelog +* Mon Aug 07 2023 xu_ping <707078654@qq.com> - 1.6.4-1 +- Upgrade version to 1.6.4 + * Thu Jan 18 2023 xingxing - 1.4.3-2 - Fix python script shebang diff --git a/linux-cm-Fix-IFA_FLAGS-detection.patch b/linux-cm-Fix-IFA_FLAGS-detection.patch deleted file mode 100644 index 25e7cb5..0000000 --- a/linux-cm-Fix-IFA_FLAGS-detection.patch +++ /dev/null @@ -1,54 +0,0 @@ -From adefe6a3394844f787424d65e5d8aa07d1167c9f Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Tue, 25 Oct 2022 23:47:01 +0200 -Subject: [PATCH] linux-cm: Fix IFA_FLAGS detection - ---- - libgupnp/gupnp-linux-context-manager.c | 6 ++++-- - meson.build | 8 ++++++++ - 2 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/libgupnp/gupnp-linux-context-manager.c b/libgupnp/gupnp-linux-context-manager.c -index 04a464a..fcc0c5a 100644 ---- a/libgupnp/gupnp-linux-context-manager.c -+++ b/libgupnp/gupnp-linux-context-manager.c -@@ -126,8 +126,10 @@ dump_rta_attr (sa_family_t family, struct rtattr *rt_attr) - case IFA_BROADCAST: label = "IFA_BROADCAST"; break; - case IFA_ANYCAST: label = "IFA_ANYCAST"; break; - case IFA_CACHEINFO: label = "IFA_CACHEINFO"; break; -- case IFA_MULTICAST: label = "IFA_MULTICAST"; break; --#if defined(IFA_FLAGS) -+ case IFA_MULTICAST: -+ label = "IFA_MULTICAST"; -+ break; -+#if defined(HAVE_IFA_FLAGS) - case IFA_FLAGS: label = "IFA_FLAGS"; break; - #endif - default: label = "Unknown"; break; -diff --git a/meson.build b/meson.build -index 024ef81..a5837a6 100644 ---- a/meson.build -+++ b/meson.build -@@ -10,11 +10,19 @@ bindir = join_paths(prefix, get_option('bindir')) - netlink_available = cc.has_header('linux/rtnetlink.h') - ifaddrs_available = cc.has_header('ifaddrs.h') - -+ifa_flags_exists = cc.compiles('''#include -+int main(int argc, char *argv[]) -+{ -+ if (IFA_FLAGS) {}; -+ return 0; -+}''', name: 'IFA_FLAGS is defined') -+ - conf = configuration_data() - conf.set_quoted('VERSION', meson.project_version()) - conf.set('HAVE_NETLINK', netlink_available) - conf.set('HAVE_IFADDRS_H', ifaddrs_available) - conf.set('HAVE_LINUX_WIRELESS_H', cc.has_header('linux/wireless.h')) -+conf.set('HAVE_IFA_FLAGS', ifa_flags_exists) - - glib_version = '2.66' - add_project_arguments(cc.get_supported_arguments('-Werror=deprecated-declarations'), language: 'c') --- -2.39.0.windows.2 -