From aa5040bffbe0eab70c38a384d13c7534cf0ad400 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Fri, 19 Jul 2013 09:00:36 +0200 Subject: [PATCH] Enable EPEL 5, add doxygen docs --- libssh.spec | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/libssh.spec b/libssh.spec index 7a50b0e..ec58b04 100644 --- a/libssh.spec +++ b/libssh.spec @@ -1,15 +1,21 @@ Name: libssh Version: 0.5.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A library implementing the SSH2 protocol (0xbadc0de version) License: LGPLv2+ URL: http://www.libssh.org/ +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: https://red.libssh.org/attachments/download/41/libssh-0.5.4.tar.gz Source1: https://red.libssh.org/attachments/download/42/libssh-0.5.4.tar.asc -Patch0: libssh-channel-close.patch +Patch0: libssh-0.5.4-channel-close.patch +Patch1: libssh-0.5.4-disable-latex-documentation.patch +Patch2: libssh-0.5.4-fix-html-doc-generation.patch +Patch3: libssh-0.5.4-fix-typo.patch BuildRequires: cmake +BuildRequires: doxygen BuildRequires: openssl-devel BuildRequires: zlib-devel @@ -22,8 +28,9 @@ Secure FTP implementation, you can play with remote files easily, without third-party programs others than libcrypto (from openssl). %package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing @@ -32,18 +39,25 @@ applications that use %{name}. %prep %setup -q %patch0 -p1 -b .channel-close +%patch1 -p1 -b .disable-latex-documentation +%patch2 -p1 -b .fix-html-doc-generation +%patch3 -p1 -b .fix-typo +# Remove examples, they are not packaged and do not build on EPEL 5 +sed -i -e 's|add_subdirectory(examples)||g' CMakeLists.txt +rm -fr examples %build mkdir obj cd obj %cmake .. make +make doc %install +rm -rf %{buildroot} cd obj make install DESTDIR=%{buildroot} find %{buildroot} -name '*.la' -delete -#chmod 644 %{buildroot}%{_includedir}/libssh/* install -d %{buildroot}%{_datadir} mv %{buildroot}/%{_libdir}/pkgconfig %{buildroot}/usr/share @@ -51,16 +65,24 @@ mv %{buildroot}/%{_libdir}/pkgconfig %{buildroot}/usr/share %postun -p /sbin/ldconfig +%clean +rm -rf %{buildroot} + %files %doc AUTHORS BSD ChangeLog COPYING README %{_libdir}/*.so.* %files devel +%doc obj/doc/html %{_datadir}/pkgconfig/*.pc %{_includedir}/* %{_libdir}/*.so %changelog +* Thu Jul 18 2013 Simone Caronni - 0.5.4-5 +- Add EPEL 5 support. +- Add Debian patches to enable Doxygen documentation. + * Tue Jul 16 2013 Simone Caronni - 0.5.4-4 - Add patch for #982685.