From 495e299303fbfa66c179ff3ed00fdbaa1f10061c Mon Sep 17 00:00:00 2001 From: Pawel Salek Date: Sun, 4 Dec 2005 12:45:56 +0000 Subject: [PATCH] - Fix bug 173332 completely, including licence issues. --- .cvsignore | 1 + libesmtp.spec | 17 ++++++++++++----- sources | 1 + 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3724d8b..5a2a72a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ libesmtp-1.0.3r1.tar.bz2 libesmtp-ssl.patch +COPYING.LGPL diff --git a/libesmtp.spec b/libesmtp.spec index a359a46..58835f6 100644 --- a/libesmtp.spec +++ b/libesmtp.spec @@ -3,10 +3,11 @@ Summary: SMTP client library Name: libesmtp Version: 1.0.3r1 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPL Group: System Environment/Libraries Source: http://www.stafford.uklinux.net/libesmtp/%{name}-%{version}.tar.bz2 +Source1: COPYING.LGPL Patch1: libesmtp-build.patch Patch2: libesmtp-ssl.patch URL: http://www.stafford.uklinux.net/libesmtp/ @@ -23,6 +24,7 @@ functionality is not the program's primary purpose. %package devel Summary: Headers and development libraries for libESMTP Group: Development/Libraries +License: LGPL/GPL Requires: %{name} = %{version}-%{release}, openssl-devel %description devel @@ -37,6 +39,7 @@ necessary for building programs against libesmtp. %setup -q %patch1 -p1 -b .build %patch2 -p1 -b .ssl +cp %{SOURCE1} . %build #we run auto* because the distributed configure script is inferior. @@ -54,7 +57,7 @@ fi %configure --with-auth-plugin-dir=%{plugindir} --enable-pthreads \ --enable-require-all-recipients --enable-debug \ --enable-etrn -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -70,19 +73,23 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS COPYING COPYING.GPL NEWS Notes README +%defattr(-,root,root,-) +%doc AUTHORS COPYING.LGPL NEWS Notes README %{_libdir}/libesmtp.so.* %{plugindir} %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) +%doc examples COPYING.GPL %{_bindir}/libesmtp-config %{_prefix}/include/* %{_libdir}/libesmtp.so %{_libdir}/libesmtp.a %changelog +* Sun Dec 4 2005 Pawel Salek - 1.0.3r1-7 +- Fix bug 173332 completely, including licence issues. + * Thu Nov 17 2005 Pawel Salek - 1.0.3r1-6 - fix #173332. diff --git a/sources b/sources index 6e0076b..0175a63 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ c07aa79293aa36298626fe5e68d6bfba libesmtp-1.0.3r1.tar.bz2 f018f16cbebc56490d2c3c18a23d3113 libesmtp-ssl.patch +a6f89e2100d9b6cdffcea4f398e37343 COPYING.LGPL