Update to 1.3.9 (RHBZ #1372506)

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

.gitignore

@@ -5,3 +5,4 @@
 /serf-1.3.5.tar.bz2
 /serf-1.3.6.tar.bz2
 /serf-1.3.7.tar.bz2
+/serf-1.3.9.tar.bz2

libserf-norpath.patch

@@ -1,9 +1,7 @@
-
+diff -uNr serf-1.3.9.orig/SConstruct serf-1.3.9/SConstruct
-https://bugzilla.redhat.com/show_bug.cgi?id=1154690
+--- serf-1.3.9.orig/SConstruct	2016-09-02 08:22:35.180532030 +0200
-
++++ serf-1.3.9/SConstruct	2016-09-02 08:22:56.653174061 +0200
---- serf-1.3.8/SConstruct.norpath
+@@ -224,9 +224,6 @@
-+++ serf-1.3.8/SConstruct
-@@ -218,9 +218,6 @@ if sys.platform != 'win32':
  else:
    LIBNAMESTATIC = 'serf-${MAJOR}'
  
@@ -12,8 +10,8 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1154690
 -
  if sys.platform == 'darwin':
  #  linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,))
-   env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,))
+   env.Append(LINKFLAGS=['-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)])
-@@ -366,12 +363,6 @@ if gssapi and CALLOUT_OKAY:
+@@ -385,12 +382,6 @@
  if sys.platform == 'win32':
    env.Append(CPPDEFINES=['SERF_HAVE_SSPI'])
  
@@ -26,8 +24,8 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1154690
  # Set up the construction of serf-*.pc
  pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
                           env.File('build/serf.pc.in'),
-@@ -439,7 +430,6 @@ env.AlwaysBuild(env.Alias('check', TEST_
+@@ -461,7 +452,6 @@
-                           ENV={'PATH' : os.environ['PATH']}))
+   TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ]
  
  # Find the (dynamic) library in this directory
 -tenv.Replace(RPATH=thisdir)

libserf.spec

@@ -1,6 +1,6 @@
 Name:           libserf
-Version:        1.3.8
+Version:        1.3.9
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        High-Performance Asynchronous HTTP Client Library
 License:        ASL 2.0
 URL:            http://serf.apache.org/
@@ -12,8 +12,7 @@ BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  scons
 BuildRequires:  pkgconfig
-Patch1:         serf-1.3.8-testfix.patch
+Patch0:         %{name}-norpath.patch
-Patch2:         serf-1.3.8-norpath.patch
 
 %description
 The serf library is a C-based HTTP client library built upon the Apache 
@@ -31,9 +30,7 @@ This package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%setup -qn serf-%{version}
+%autosetup -n serf-%{version} -p1
-%patch1 -p1 -b .testfix
-%patch2 -p1 -b .norpath
 
 # Shared library versioning support in scons is worse than awful...
 # minimally, here fix the soname to match serf-1.2.x.  Minor version
@@ -74,6 +71,9 @@ scons %{?_smp_mflags} check || true
 %{_libdir}/pkgconfig/serf*.pc
 
 %changelog
+* Fri Sep 02 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 1.3.9-1
+- Update to 1.3.9 (RHBZ #1372506)
+
 * Sat Apr 09 2016 Igor Gnatenko <ignatenko@redhat.com> - 1.3.8-3
 - Add LDFLAGS provided by RPM
 

serf-1.3.8-testfix.patch

@@ -1,14 +0,0 @@
-
-Fix build.
-
---- serf-1.3.8/test/test_buckets.c.testfix
-+++ serf-1.3.8/test/test_buckets.c
-@@ -1234,7 +1234,7 @@ static apr_status_t deflate_compress(con
-        uncompressed data, + 12 bytes. This info comes from zlib.h.
-        Note: This isn't sufficient when using Z_NO_FLUSH and extremely compressed
-        data. Use a buffer bigger than what we need. */
--//    buf_size = orig_len + (orig_len / 1000) + 12;
-+    /* buf_size = orig_len + (orig_len / 1000) + 12; */
-     buf_size = 100000;
- 
-     write_buf = apr_palloc(pool, buf_size);

sources

@@ -1 +1 @@
-2e4efe57ff28cb3202a112e90f0c2889  serf-1.3.8.tar.bz2
+370a6340ff20366ab088012cd13f2b57  serf-1.3.9.tar.bz2