X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libsoup.spec;h=83c00b42ce76fd22eee6d7f9d165eec2b4701133;hb=c9a244c2c305c3c84fd29345f9c08b77dacef2cd;hp=6a88c27b7fafc03d93f7860c428fab983bcd23ad;hpb=abe773f821e60bab72bb2e13299b9558a3817479;p=packages%2Flibsoup3.git

diff --git a/libsoup.spec b/libsoup.spec
index 6a88c27..83c00b4 100644
--- a/libsoup.spec
+++ b/libsoup.spec
@@ -1,29 +1,30 @@
 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.32.1
-Release:	2
+Version:	2.40.0
+Release:	1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5:	894ca0077ec2d923286a69766d0b0b74
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.40/%{name}-%{version}.tar.xz
+# Source0-md5:	4d66366e08271e22aef164ec4d74e5f0
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel
 BuildRequires:	autoconf >= 2.63
-BuildRequires:	automake >= 1:1.9
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	glib2-devel >= 1:2.22.0
-BuildRequires:	gnutls-devel >= 2.1.7
-BuildRequires:	gobject-introspection-devel >= 0.9.5
+BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.33.1
+BuildRequires:	gobject-introspection-devel >= 0.10.0
 BuildRequires:	gtk-doc >= 1.10
+BuildRequires:	intltool >= 0.35.0
 BuildRequires:	libgnome-keyring-devel
-BuildRequires:	libproxy-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.0
 BuildRequires:	libxml2-devel >= 1:2.6.31
 BuildRequires:	pkgconfig
 BuildRequires:	sqlite3-devel
-Requires:	glib2 >= 1:2.22.0
-Requires:	gnutls >= 2.1.7
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Requires:	glib-networking
+Requires:	glib2 >= 1:2.33.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,8 +44,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.33.1
 Requires:	libxml2-devel >= 1:2.6.31
 
 %description devel
@@ -120,16 +120,17 @@ Dokumentacja API libsoup.
 
 %build
 %{__gtkdocize}
-%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	--enable-ssl \
 	--enable-gtk-doc \
 	--with-html-dir=%{_gtkdocdir} \
+	--without-apache-httpd \
+	--disable-tls-check \
 	--disable-silent-rules
 %{__make}
 
@@ -137,10 +138,12 @@ Dokumentacja API libsoup.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	pkgconfigdir=%{_pkgconfigdir} \
-	m4datadir=%{_aclocaldir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%find_lang libsoup
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -150,7 +153,7 @@ 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.*.*.*
@@ -160,7 +163,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -178,7 +180,6 @@ rm -rf $RPM_BUILD_ROOT
 %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