packages: libevent/libevent.spec - rel 2 - there is no need to rebuild ac/a...

[baggins]

Author: baggins                      Date: Fri Sep 24 16:11:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- there is no need to rebuild ac/am stuff
- added dietlibc package for nfs-utils

---- Files affected:
packages/libevent:
   libevent.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: packages/libevent/libevent.spec
diff -u packages/libevent/libevent.spec:1.32 packages/libevent/libevent.spec:1.33
--- packages/libevent/libevent.spec:1.32	Thu Jun 24 13:24:22 2010
+++ packages/libevent/libevent.spec	Fri Sep 24 18:11:06 2010
@@ -5,12 +5,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
@@ -18,11 +19,13 @@
 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
@@ -59,27 +62,55 @@
 %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
 
@@ -121,12 +152,25 @@
 %{_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
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2010/09/24 16:11:06  baggins
+- rel 2
+- there is no need to rebuild ac/am stuff
+- added dietlibc package for nfs-utils
+
 Revision 1.32  2010/06/24 11:24:22  lisu
 - 1.4.14b
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libevent/libevent.spec?r1=1.32&r2=1.33&f=u