X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libsoup.spec;h=f3bf5d71612f9d49c700ce1b68721443cd79412d;hb=b66ea2de5035bddf08a36f7a0624958e1b0dd038;hp=49cdb72d862cd501382d5de440f423fc9bf555f5;hpb=ac6b3fa3974da2f82e0d914acb6a3d1a45f7e998;p=packages%2Flibsoup.git

diff --git a/libsoup.spec b/libsoup.spec
index 49cdb72..f3bf5d7 100644
--- a/libsoup.spec
+++ b/libsoup.spec
@@ -1,22 +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.2.104
+Version:	2.34.3
 Release:	1
-License:	LGPL v2
-Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.2/%{name}-%{version}.tar.bz2
-# Source0-md5:	ab3b10b1c97de5abe38a748a3656da4c
+License:	LGPL v2+
+Group:		Libraries
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.34/%{name}-%{version}.tar.bz2
+# Source0-md5:	7112d198724f8d29fac4647ef400e39b
 URL:		http://www.gnome.org/
-BuildRequires:	autoconf >= 2.53
-BuildRequires:	automake
-BuildRequires:	glib2-devel >= 1:2.14.1
-BuildRequires:	gnutls-devel >= 1.2.5
-BuildRequires:	gtk-doc >= 1.6
-BuildRequires:	libgpg-error-devel >= 0.4
+BuildRequires:	GConf2-devel
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	docbook-dtd412-xml
+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.27
+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
@@ -31,26 +37,14 @@ do wysyłania i serwowania żądań SOAP oraz WSDL (Web Service Definition
 Language) dla kompilatora C, który generuje klienckie stub i szkielety
 serwerów dla łatwego wywoływania i implementowania metod SOAP.
 
-%package apidocs
-Summary:	libsoup API documentation
-Summary(pl.UTF-8):	Dokumentacja API libsoup
-Group:		Documentation
-Requires:	gtk-doc-common
-
-%description apidocs
-libsoup API documentation.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API libsoup.
-
 %package devel
 Summary:	Include files etc to develop SOAP applications
 Summary(pl.UTF-8):	Pliki nagłówkowe, dokumentacja dla SOAP
-Group:		X11/Development/Libraries
+Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.14.1
-Requires:	gnutls-devel >= 1.0.6
-Requires:	libxml2-devel >= 1:2.6.27
+Requires:	glib2-devel >= 1:2.28.0
+Requires:	libproxy-devel
+Requires:	libxml2-devel >= 1:2.6.31
 
 %description devel
 Header files, etc you can use to develop SOAP applications.
@@ -62,7 +56,7 @@ samemu tworzyć sobie aplikacje korzystające z SOAP.
 %package static
 Summary:	SOAP static libraries
 Summary(pl.UTF-8):	Biblioteki statyczne SOAP
-Group:		X11/Development/Libraries
+Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
@@ -71,53 +65,126 @@ SOAP static libraries.
 %description static -l pl.UTF-8
 Biblioteki statyczne SOAP.
 
+%package gnome
+Summary:	GNOME specific extensions to libsoup library
+Summary(pl.UTF-8):	Rozszerzenia GNOME do biblioteki libsoup
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description gnome
+GNOME specific extensions to libsoup library.
+
+%description gnome -l pl.UTF-8
+Rozszerzenia GNOME do biblioteki libsoup.
+
+%package gnome-devel
+Summary:	Header files for libsoup-gnome library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libsoup-gnome
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-gnome = %{version}-%{release}
+
+%description gnome-devel
+Header files for libsoup-gnome library.
+
+%description gnome-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libsoup-gnome.
+
+%package gnome-static
+Summary:	Static libsoup-gnome library
+Summary(pl.UTF-8):	Statyczna biblioteka libsoup-gnome
+Group:		Development/Libraries
+Requires:	%{name}-gnome-devel = %{version}-%{release}
+
+%description gnome-static
+Static libsoup-gnome library.
+
+%description gnome-static -l pl.UTF-8
+Statyczna biblioteka libsoup-gnome.
+
+%package apidocs
+Summary:	libsoup API documentation
+Summary(pl.UTF-8):	Dokumentacja API libsoup
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+libsoup API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API libsoup.
+
 %prep
 %setup -q
 
 %build
+%{__gtkdocize}
 %{__glib_gettextize}
 %{__libtoolize}
 %{__aclocal}
-%{__autoheader}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
-	--enable-ssl \
 	--enable-gtk-doc \
-	--enable-libgpg-error \
-	--with-html-dir=%{_gtkdocdir}
+	--with-html-dir=%{_gtkdocdir} \
+	--without-apache-httpd \
+	--disable-tls-check \
+	--disable-silent-rules
 %{__make}
 
 %install
 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
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%post	gnome -p /sbin/ldconfig
+%postun	gnome -p /sbin/ldconfig
 
-%files apidocs
+%files
 %defattr(644,root,root,755)
-%{_gtkdocdir}/%{name}
+%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}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*
-%{_pkgconfigdir}/*
+%attr(755,root,root) %{_libdir}/libsoup-2.4.so
+%{_includedir}/libsoup-2.4
+%{_pkgconfigdir}/libsoup-2.4.pc
+%{_datadir}/gir-1.0/Soup-2.4.gir
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libsoup-2.4.a
+
+%files gnome
+%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
+%{_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
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/libsoup-2.4