X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libsoup.spec;h=903489ca1cc005314709875978f728a887a11b25;hb=a7fb9f4;hp=c5076a3b7b792eab3b795fe7e06d594bc16c6e5b;hpb=3ac7c038a5b7ebc4411ac33033a960f847355849;p=packages%2Flibsoup.git

diff --git a/libsoup.spec b/libsoup.spec
index c5076a3..903489c 100644
--- a/libsoup.spec
+++ b/libsoup.spec
@@ -1,26 +1,43 @@
+#
+# Conditional build:
+%bcond_without	apidocs	# API documentation
+
 Summary:	SOAP (Simple Object Access Protocol) implementation in C
 Summary(pl.UTF-8):	Implementacja w C SOAP (Simple Object Access Protocol)
 Name:		libsoup
-Version:	2.30.1
+Version:	2.72.0
 Release:	1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.30/%{name}-%{version}.tar.bz2
-# Source0-md5:	d80fb560a72370fba347785b00a750fb
-URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel
-BuildRequires:	autoconf >= 2.63
-BuildRequires:	automake >= 1:1.9
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.72/%{name}-%{version}.tar.xz
+# Source0-md5:	859380b76b51fb55d720daea3c76c945
+Patch0:		%{name}-path-override.patch
+URL:		https://wiki.gnome.org/Projects/libsoup
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	glib2-devel >= 1:2.22.0
-BuildRequires:	gnutls-devel >= 2.1.7
-BuildRequires:	gtk-doc >= 1.6
-BuildRequires:	libgnome-keyring-devel
-BuildRequires:	libproxy-devel
-BuildRequires:	libtool
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.58
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.20}
+BuildRequires:	heimdal-devel
+BuildRequires:	libbrotli-devel
+BuildRequires:	libpsl-devel >= 0.20.0
 BuildRequires:	libxml2-devel >= 1:2.6.31
+BuildRequires:	meson >= 0.50
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	sqlite3-devel
+BuildRequires:	sysprof-devel >= 3.38
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	vala
+BuildRequires:	xz
+BuildRequires:	zlib-devel
+Requires:	glib2 >= 1:2.58
+Requires:	libpsl >= 0.20.0
+# for TLS support
+Suggests:	glib-networking
+# ntlm_auth for NTLM support
+Suggests:	samba-winbind
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,8 +57,7 @@ Summary:	Include files etc to develop SOAP applications
 Summary(pl.UTF-8):	Pliki nagłówkowe, dokumentacja dla SOAP
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.22.0
-Requires:	gnutls-devel >= 2.1.7
+Requires:	glib2-devel >= 1:2.58
 Requires:	libxml2-devel >= 1:2.6.31
 
 %description devel
@@ -105,6 +121,9 @@ Summary:	libsoup API documentation
 Summary(pl.UTF-8):	Dokumentacja API libsoup
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "4.6"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 libsoup API documentation.
@@ -112,31 +131,42 @@ libsoup API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API libsoup.
 
+%package -n vala-libsoup
+Summary:	libsoup API for Vala language
+Summary(pl.UTF-8):	API libsoup dla języka Vala
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	vala
+%if "%{_rpmversion}" >= "4.6"
+BuildArch:	noarch
+%endif
+
+%description -n vala-libsoup
+libsoup API for Vala language.
+
+%description -n vala-libsoup -l pl.UTF-8
+API libsoup dla języka Vala.
+
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__gtkdocize}
-%{__glib_gettextize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--enable-ssl \
-	--enable-gtk-doc \
-	--with-html-dir=%{_gtkdocdir} \
-	--disable-silent-rules
-%{__make}
+%meson build \
+	%{?with_apidocs:-Dgtk_doc=true} \
+	-Dntlm=enabled \
+	-Dntlm_auth=/usr/bin/ntlm_auth \
+	-Dtests=false \
+	-Dtls_check=false
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	pkgconfigdir=%{_pkgconfigdir} \
-	m4datadir=%{_aclocaldir} \
-	DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
+
+%find_lang libsoup
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -147,18 +177,19 @@ rm -rf $RPM_BUILD_ROOT
 %post	gnome -p /sbin/ldconfig
 %postun	gnome -p /sbin/ldconfig
 
-%files
+%files -f libsoup.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
 %attr(755,root,root) %{_libdir}/libsoup-2.4.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsoup-2.4.so.1
+%{_libdir}/girepository-1.0/Soup-2.4.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsoup-2.4.so
-%{_libdir}/libsoup-2.4.la
 %{_includedir}/libsoup-2.4
 %{_pkgconfigdir}/libsoup-2.4.pc
+%{_datadir}/gir-1.0/Soup-2.4.gir
 
 %files static
 %defattr(644,root,root,755)
@@ -168,18 +199,26 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsoup-gnome-2.4.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsoup-gnome-2.4.so.1
+%{_libdir}/girepository-1.0/SoupGNOME-2.4.typelib
 
 %files gnome-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsoup-gnome-2.4.so
-%{_libdir}/libsoup-gnome-2.4.la
 %{_includedir}/libsoup-gnome-2.4
 %{_pkgconfigdir}/libsoup-gnome-2.4.pc
+%{_datadir}/gir-1.0/SoupGNOME-2.4.gir
 
 %files gnome-static
 %defattr(644,root,root,755)
 %{_libdir}/libsoup-gnome-2.4.a
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libsoup-2.4
+%endif
+
+%files -n vala-libsoup
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/libsoup-2.4.deps
+%{_datadir}/vala/vapi/libsoup-2.4.vapi