- updated to 2.34.3 (fixes CVE-2011-2054)

[packages/libsoup.git] / libsoup.spec

diff --git a/libsoup.spec b/libsoup.spec
index 7cd4b85fad344a8a2990d225a67b1f4c407e70a5..f3bf5d71612f9d49c700ce1b68721443cd79412d 100644 (file)
--- a/libsoup.spec
+++ b/libsoup.spec
@@ -1,27 +1,28 @@
 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.2
-Release:       3
+Version:       2.34.3
+Release:       1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.30/%{name}-%{version}.tar.bz2
-# Source0-md5: f33b62063e76a9b1d5503363a3ed6a84
-Patch0:                %{name}-gnutls-TLS1.2.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.34/%{name}-%{version}.tar.bz2
+# Source0-md5: 7112d198724f8d29fac4647ef400e39b
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.9
 BuildRequires: docbook-dtd412-xml
-BuildRequires: glib2-devel >= 1:2.22.0
-BuildRequires: gnutls-devel >= 2.1.7
-BuildRequires: gtk-doc >= 1.6
+BuildRequires: glib2-devel >= 1:2.28.0
+BuildRequires: gobject-introspection-devel >= 0.10.0
+BuildRequires: gtk-doc >= 1.10
 BuildRequires: libgnome-keyring-devel
 BuildRequires: libproxy-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 1:2.6.31
 BuildRequires: pkgconfig
 BuildRequires: sqlite3-devel
+Requires:      glib-networking
+Requires:      glib2 >= 1:2.28.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,8 +42,8 @@ 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.28.0
+Requires:      libproxy-devel
 Requires:      libxml2-devel >= 1:2.6.31
 
 %description devel
@@ -115,7 +116,6 @@ Dokumentacja API libsoup.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__gtkdocize}
@@ -126,9 +126,10 @@ Dokumentacja API libsoup.
 %{__autoheader}
 %{__automake}
 %configure \
-       --enable-ssl \
        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir} \
+       --without-apache-httpd \
+       --disable-tls-check \
        --disable-silent-rules
 %{__make}
 
@@ -136,10 +137,10 @@ Dokumentacja API libsoup.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       pkgconfigdir=%{_pkgconfigdir} \
-       m4datadir=%{_aclocaldir} \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -154,13 +155,14 @@ rm -rf $RPM_BUILD_ROOT
 %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)
@@ -170,13 +172,14 @@ 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)