From 3911c83b3c08afbfa39b0bc927afb11189d0e1c8 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Wed, 10 Aug 2011 08:51:08 -0400 Subject: [PATCH] Updated to latest stable upstream version: 2.0.13-stable (bz 727129) Signed-off-by: Steve Dickson --- .gitignore | 2 +- libevent-2.0.13-manpages-on.patch | 12 ++++++++++++ libevent.spec | 20 +++++++++++++------- sources | 2 +- 4 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 libevent-2.0.13-manpages-on.patch diff --git a/.gitignore b/.gitignore index b806780..95899ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libevent-2.0.12-stable.tar.gz +/libevent-2.0.13-stable.tar.gz diff --git a/libevent-2.0.13-manpages-on.patch b/libevent-2.0.13-manpages-on.patch new file mode 100644 index 0000000..97dd633 --- /dev/null +++ b/libevent-2.0.13-manpages-on.patch @@ -0,0 +1,12 @@ +diff -up libevent-2.0.13-stable/Doxyfile.orig libevent-2.0.13-stable/Doxyfile +--- libevent-2.0.13-stable/Doxyfile.orig 2011-07-05 13:04:30.000000000 -0400 ++++ libevent-2.0.13-stable/Doxyfile 2011-08-10 08:18:42.036654445 -0400 +@@ -175,7 +175,7 @@ LATEX_HIDE_INDICES = NO + # If the GENERATE_MAN tag is set to YES (the default) Doxygen will + # generate man pages + +-GENERATE_MAN = NO ++GENERATE_MAN = YES + + # The MAN_EXTENSION tag determines the extension that is added to + # the generated man pages (default is the subroutine's section .3) diff --git a/libevent.spec b/libevent.spec index 4e5bb04..6d24924 100644 --- a/libevent.spec +++ b/libevent.spec @@ -1,5 +1,5 @@ Name: libevent -Version: 2.0.12 +Version: 2.0.13 Release: 1%{?dist} Summary: Abstract asynchronous event notification library @@ -11,6 +11,7 @@ Source0: http://downloads.sourceforge.net/levent/%{name}-%{version}-stabl BuildRequires: doxygen openssl-devel Patch00: libevent-2.0.10-stable-configure.patch +Patch01: libevent-2.0.13-manpages-on.patch %description The libevent API provides a mechanism to execute a callback function @@ -36,6 +37,8 @@ you will need to install %{name}-devel. # 477685 - libevent-devel multilib conflict %patch00 -p1 +# Enable man pages +%patch01 -p1 %build %configure \ @@ -52,19 +55,19 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/html (cd doxygen/html; \ - install *.* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/html) + install -p -m 644 *.* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/html) mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/latex (cd doxygen/latex; \ - install *.* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/latex) + install -p -m 644 *.* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/latex) -mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/man/man3 +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3 (cd doxygen/man/man3; \ - install *.3 $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/man/man3) + install -p -m 644 *.* $RPM_BUILD_ROOT/%{_mandir}/man3/) mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample (cd sample; \ - install *.c Makefile* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample) + install -p -m 644 *.c Makefile* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample) %post -p /sbin/ldconfig @@ -101,10 +104,13 @@ mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample %{_docdir}/%{name}-devel-%{version}/html/* %{_docdir}/%{name}-devel-%{version}/latex/* -%{_docdir}/%{name}-devel-%{version}/man/man3/* %{_docdir}/%{name}-devel-%{version}/sample/* +%{_mandir}/man3/* %changelog +* Wed Aug 10 2011 Steve Dickson 2.0.13-1 +- Updated to latest stable upstream version: 2.0.13-stable (bz 727129) + * Tue Aug 2 2011 Steve Dickson 2.0.12-1 - Updated to latest stable upstream version: 2.0.12-stable diff --git a/sources b/sources index fb84c9c..2fbcd46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -42986228baf95e325778ed328a93e070 libevent-2.0.12-stable.tar.gz +af786b4b3f790c9d3279792edf7867fc libevent-2.0.13-stable.tar.gz