- updated to 0.7.0

- added sh patch (quotes fix needed by ksh)

Changed files:
    serf-sh.patch -> 1.1
    serf.spec -> 1.4

diff --git a/serf-sh.patch b/serf-sh.patch
new file mode 100644 (file)
index 0000000..f9435c8
--- /dev/null
+++ b/serf-sh.patch
@@ -0,0 +1,11 @@
+--- serf-0.7.0/configure.in.orig       2009-07-28 00:20:24.000000000 +0200
++++ serf-0.7.0/configure.in    2010-11-16 21:59:51.355099937 +0100
+@@ -78,7 +78,7 @@
+ AC_SUBST(APR_VERSION)
+ AC_SUBST(APR_CONFIG)
+ 
+-APR_VERSION_MAJOR="`echo \"$APR_VERSION\" | sed 's,\..*,,'`"
++APR_VERSION_MAJOR="$(echo "$APR_VERSION" | sed 's,\..*,,')"
+ APR_VERSION_NUM="`echo \"$APR_VERSION\" | \
+                 sed -e 's/[[^0-9\.]].*$//' \
+                     -e 's/\.\([[0-9]]\)$/.0\1/' \

diff --git a/serf.spec b/serf.spec
index cab5d04d08f38318e2cc968316a5e1f4e2bf8b62..f260dfe441029b9140b6792d7a63eacb32e44aa2 100644 (file)
--- a/serf.spec
+++ b/serf.spec
@@ -5,15 +5,19 @@
 Summary:       A high-performance asynchronous HTTP client library
 Summary(pl.UTF-8):     Wysokowydajna biblioteka asynchronicznego klienta HTTP
 Name:          serf
-Version:       0.3.0
+Version:       0.7.0
 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: 5c4b6d8b44135abbde289b49122bb7af
+Patch0:                %{name}-sh.patch
 URL:           http://code.google.com/p/serf/
 BuildRequires: apr-devel
 BuildRequires: apr-util-devel
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,6 +41,7 @@ Summary(pl.UTF-8):    Pliki nagłówkowe serf
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      apr-devel
+Requires:      apr-util-devel
 
 %description devel
 C header files for the serf library.
@@ -58,8 +63,11 @@ Statyczne biblioteki serf.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__aclocal} -I build
+%{__autoconf}
 %configure \
        --with-apr=%{_prefix} \
        --with-apr-util=%{_prefix} \
@@ -83,15 +91,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-0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libserf-0.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libserf-*.so
-%{_libdir}/libserf-*.la
+%attr(755,root,root) %{_libdir}/libserf-0.so
+%{_libdir}/libserf-0.la
 %{_includedir}/serf*.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libserf-*.a
+%{_libdir}/libserf-0.a