X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libsoup.spec;h=9ee5c8138726970233a81c4d779f73232f7efb67;hb=8df3eb7ded951db0d2a500f724666a6898aed023;hp=9d884222b2eea6a6c893c2df75f9f01ca9777ca9;hpb=09867d819f19dbaf10d8aed7873ac0f2a6258cc2;p=packages%2Flibsoup3.git

diff --git a/libsoup.spec b/libsoup.spec
index 9d88422..9ee5c81 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.30.2
-Release:	4
+Version:	2.54.0.1
+Release:	3
 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
-Patch1:		gobject-introspection.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.54/%{name}-%{version}.tar.xz
+# Source0-md5:	758dd62709fdf342c663cc63705eed4b
 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:	gtk-doc >= 1.6
-BuildRequires:	libgnome-keyring-devel
-BuildRequires:	libproxy-devel
-BuildRequires:	libtool
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.38.0
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gtk-doc >= 1.20
+BuildRequires:	heimdal-devel
+BuildRequires:	intltool >= 0.35.0
+BuildRequires:	libtool >= 2:2.0
 BuildRequires:	libxml2-devel >= 1:2.6.31
 BuildRequires:	pkgconfig
 BuildRequires:	sqlite3-devel
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Requires:	glib-networking
+Requires:	glib2 >= 1:2.38.0
 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.38.0
 Requires:	libxml2-devel >= 1:2.6.31
 
 %description devel
@@ -108,6 +108,9 @@ Summary:	libsoup API documentation
 Summary(pl.UTF-8):	Dokumentacja API libsoup
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 libsoup API documentation.
@@ -115,23 +118,38 @@ 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}" >= "5"
+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
-%patch1 -p1
 
 %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}
 
@@ -139,10 +157,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
 
@@ -152,7 +172,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.*.*.*
@@ -162,7 +182,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
@@ -180,7 +199,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
@@ -192,3 +210,8 @@ rm -rf $RPM_BUILD_ROOT
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libsoup-2.4
+
+%files -n vala-libsoup
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/libsoup-2.4.deps
+%{_datadir}/vala/vapi/libsoup-2.4.vapi