diff --git a/.gitignore b/.gitignore index b94af28..cb549bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /serf-1.2.1.tar.bz2 +/serf-1.3.2.tar.bz2 diff --git a/libserf.spec b/libserf.spec index c887906..0ba6cf9 100644 --- a/libserf.spec +++ b/libserf.spec @@ -1,21 +1,16 @@ %global oname serf Name: libserf -Version: 1.2.1 -Release: 4%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Summary: High-Performance Asynchronous HTTP Client Library License: ASL 2.0 Url: http://code.google.com/p/serf Source0: https://serf.googlecode.com/files/serf-%{version}.tar.bz2 -BuildRequires: autoconf -BuildRequires: apr-util-devel -BuildRequires: apr-devel -BuildRequires: krb5-devel -BuildRequires: libtool -BuildRequires: libgssapi-devel -BuildRequires: openssl-devel -BuildRequires: pkgconfig -BuildRequires: zlib-devel + +BuildRequires: apr-util-devel, apr-devel, krb5-devel, +BuildRequires: krb5-devel, openssl-devel, zlib-devel +BuildRequires: scons, pkgconfig %description The serf library is a C-based HTTP client library built upon the Apache @@ -34,21 +29,27 @@ developing applications that use %{name}. %prep %setup -q -n %{oname}-%{version} -sed -i 's|644 $(TARGET_LIB)|755 $(TARGET_LIB)|g' Makefile.in + +# Shared library versioning support in scons is worse than awful... +# minimally, here fix the soname to match serf-1.2.x. Minor version +# handling should be fixed too; really requires better upstream support: +# http://scons.tigris.org/issues/show_bug.cgi?id=2869 +sed -i '/SHLIBVERSION/s/MAJOR/0/' SConstruct %build -autoreconf -fiv -export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags}" -%configure --includedir=%{_includedir}/%{oname}-1 --with-gssapi=%{_prefix} -make %{?_smp_mflags} +scons \ + CFLAGS="%{optflags}" \ + PREFIX=%{_prefix} \ + LIBDIR=%{_libdir} \ + GSSAPI=%{_prefix} \ + %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} -find %{buildroot} -name '*.*a' -exec rm -f {} ';' +scons install --install-sandbox=%{buildroot} +find %{buildroot} -name '*.*a' -exec rm -vf {} ';' %check -make check +scons %{?_smp_mflags} check %post -p /sbin/ldconfig @@ -64,6 +65,10 @@ make check %{_libdir}/pkgconfig/%{oname}*.pc %changelog +* Wed Nov 6 2013 Joe Orton - 1.3.2-1 +- update to 1.3.2 +- require krb5-devel for libgssapi (#1027011) + * Sat Aug 03 2013 Fedora Release Engineering - 1.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index c73bbab..c35dd9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f8e76c9c6567aee1d66aba49f76a58b serf-1.2.1.tar.bz2 +43ce30fccf39ab0186a7590e2733e3ec serf-1.3.2.tar.bz2