- updated to 1.3.1 (note: new soname; build system changed to scons)

[packages/serf.git] / serf.spec

diff --git a/serf.spec b/serf.spec
index cab5d04d08f38318e2cc968316a5e1f4e2bf8b62..499d6bc23adb6cdfafba0b43c4c6c8d032cb040c 100644 (file)
--- a/serf.spec
+++ b/serf.spec
@@ -1,20 +1,26 @@
 #
 # Conditional build:
-%bcond_without tests   # don't perform "make check"
+%bcond_without kerberos5       # GSSAPI support
+%bcond_with    tests           # perform "scons check" (uses localhost network, fails on apr side when IPV6 is enabled and localhost resolves only to IPV4 addresses)
 #
 Summary:       A high-performance asynchronous HTTP client library
 Summary(pl.UTF-8):     Wysokowydajna biblioteka asynchronicznego klienta HTTP
 Name:          serf
-Version:       0.3.0
+Version:       1.3.1
 Release:       1
-License:       Apache
+License:       Apache v2.0
 Group:         Libraries
+#Source0Download: http://code.google.com/p/serf/downloads/list
 Source0:       http://serf.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5: d5c7f41d1c9f1589b98affc1fa029982
+# Source0-md5: da5aca0cad19fd9c19129c3f8f7393dd
+Patch0:                %{name}-scons.patch
 URL:           http://code.google.com/p/serf/
 BuildRequires: apr-devel
 BuildRequires: apr-util-devel
+%{?with_kerberos5:BuildRequires:       heimdal-devel}
 BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: scons >= 2.3.0
+BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,6 +43,9 @@ Summary(pl.UTF-8):    Pliki nagłówkowe serf
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      apr-devel
+Requires:      apr-util-devel
+%{?with_kerberos5:Requires:    heimdal-devel}
+Requires:      openssl-devel >= 0.9.7d
 
 %description devel
 C header files for the serf library.
@@ -58,21 +67,25 @@ Statyczne biblioteki serf.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure \
-       --with-apr=%{_prefix} \
-       --with-apr-util=%{_prefix} \
-       --with-openssl=%{_prefix}
-%{__make}
+%scons \
+       PREFIX=%{_prefix} \
+       LIBDIR=%{_libdir} \
+       GSSAPI=/usr
 
-%{?with_tests:%{__make} check}
+%if %{with tests}
+%scons check
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%scons install \
+       PREFIX=%{_prefix} \
+       LIBDIR=%{_libdir} \
+       --install-sandbox=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,15 +96,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGES NOTICE README
-%attr(755,root,root) %{_libdir}/libserf-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libserf-*.so.[0-9]
+%attr(755,root,root) %{_libdir}/libserf-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libserf-1.so.3
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libserf-*.so
-%{_libdir}/libserf-*.la
-%{_includedir}/serf*.h
+%attr(755,root,root) %{_libdir}/libserf-1.so
+%{_includedir}/serf-1
+%{_pkgconfigdir}/serf-1.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libserf-*.a
+%{_libdir}/libserf-1.a