- rel 2

- there is no need to rebuild ac/am stuff
- added dietlibc package for nfs-utils

Changed files:
    libevent.spec -> 1.33

diff --git a/libevent.spec b/libevent.spec
index eb8c56d31e3a1d7eb559a6108872b6957bca9c7d..310db5df3bdeaf68677e61cbdb86d6c7a2d4d877 100644 (file)
--- a/libevent.spec
+++ b/libevent.spec
@@ -4,12 +4,13 @@
 #
 # Conditional build:
 %bcond_without static_libs     # don't build static library
+%bcond_without dietlibc        # don't build static dietlibc library
 #
 Summary:       libevent - an event notification library
 Summary(pl.UTF-8):     libevent - biblioteka powiadamiająca o zdarzeniach
 Name:          libevent
 Version:       1.4.14b
-Release:       1
+Release:       2
 License:       BSD
 Group:         Libraries
 Source0:       http://www.monkey.org/~provos/%{name}-%{version}-stable.tar.gz
@@ -17,11 +18,13 @@ Source0:    http://www.monkey.org/~provos/%{name}-%{version}-stable.tar.gz
 Patch0:                %{name}-fpm.patch
 Patch1:                %{name}.fb-changes.diff
 URL:           http://www.monkey.org/~provos/libevent/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
+%{?with_dietlibc:BuildRequires:        dietlibc-static >= 2:0.31-5}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# for some reason known only to rpm there must be "\\|" not "\|" here
+%define                dietarch        %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/')
+%define                dietlibdir      %{_prefix}/lib/dietlibc/lib-%{dietarch}
+
 %description
 The libevent API provides a mechanism to execute a callback function
 when a specific event occurs on a file descriptor or after a timeout
@@ -58,27 +61,55 @@ Static libevent library.
 %description static -l pl.UTF-8
 Statyczna biblioteka libevent.
 
+%package dietlibc
+Summary:       Static dietlibc libevent library
+Summary(pl.UTF-8):     Biblioteka statyczna dietlibc libevent
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description dietlibc
+Static dietlibc libevent library.
+
+%description dietlibc -l pl.UTF-8
+Biblioteka statyczna dietlibc libevent.
+
 %prep
 %setup -q -n %{name}-%{version}-stable
 %patch0 -p1
 %patch1 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
+%if %{with dietlibc}
+%configure \
+       CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -D_BSD_SOURCE -D_EVENT_HAVE_FD_MASK" \
+       --enable-static \
+       --disable-shared
+
+# libtool sucks, build just the libs
+%{__make}
+mv .libs/libevent.a diet-libevent.a
+mv .libs/libevent_core.a diet-libevent_core.a
+mv .libs/libevent_extra.a diet-libevent_extra.a
+%{__make} clean
+%endif
+
 %configure \
        %{!?with_static_libs:--disable-static}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with dietlibc}
+install diet-libevent.a $RPM_BUILD_ROOT%{dietlibdir}/libevent.a
+install diet-libevent_core.a $RPM_BUILD_ROOT%{dietlibdir}/libevent_core.a
+install diet-libevent_extra.a $RPM_BUILD_ROOT%{dietlibdir}/libevent_extra.a
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -119,3 +150,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libevent_core.a
 %{_libdir}/libevent_extra.a
 %endif
+
+%if %{with dietlibc}
+%files dietlibc
+%defattr(644,root,root,755)
+%{dietlibdir}/libevent.a
+%{dietlibdir}/libevent_core.a
+%{dietlibdir}/libevent_extra.a
+%endif