From 3e2774175c143e775398708a8051bb042a6c1271 Mon Sep 17 00:00:00 2001 From: jvdias Date: Dec 20 2005 20:34:09 +0000 Subject: fix bug 176175: perl-String-CRC32 now in separate RPM --- diff --git a/lftp.spec b/lftp.spec index 732e6cc..ff7b6de 100644 --- a/lftp.spec +++ b/lftp.spec @@ -1,16 +1,14 @@ Summary: A sophisticated file transfer program Name: lftp Version: 3.3.5 -Release: 1 +Release: 2 License: GPL Group: Applications/Internet Source0: http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2 -Source1: http://search.cpan.org/CPAN/authors/id/S/SO/SOENKE/String-CRC32-1.3.tar.gz -#Source2: http://ftp.yars.free.net/lftp/lftp-3.3.1-3.3.2.diff.gz URL: http://lftp.yar.ru/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: ncurses-devel, openssl-devel, pkgconfig, readline-devel, perl -Provides: perl(String::CRC32), perl-String-CRC32 +BuildPrereq: ncurses-devel, openssl-devel, pkgconfig, readline-devel +Requires: perl-String-CRC32 Patch173276: lftp-3.3.5-bz173276.patch %description @@ -21,8 +19,6 @@ reliability in mind. %prep %setup -q -#gunzip < %SOURCE2 > lftp-3.3.1-3.3.2.patch -#patch -p1 -b --suffix=.3.3.2 -s < lftp-3.3.1-3.3.2.patch %patch173276 -p1 -b .bz173276 %build @@ -34,11 +30,6 @@ LDFLAGS="-L`pwd`/src/.libs $LDFLAGS"; export LDFLAGS %configure --with-modules --disable-static --with-ssl --with-debug export tagname=CC make LIBTOOL=%{_bindir}/libtool -gunzip < %SOURCE1 | tar -xpf - -pushd String-CRC32-1.3 -CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix} < /dev/null -make OPTIMIZE="$RPM_OPT_FLAGS" -popd %install rm -rf $RPM_BUILD_ROOT @@ -49,20 +40,7 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/* chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.so # Remove files from $RPM_BUILD_ROOT that we aren't shipping. rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a -# Build the String::CRC32 module, required by new verify-file script -pushd String-CRC32-1.3 >/dev/null 2>&1 -eval `perl '-V:installarchlib' '-V:installprefix' '-V:installstyle'` -perldir=${installprefix}/${installstyle} -mkdir -p $RPM_BUILD_ROOT$installarchlib -%makeinstall -# Remove files from String::CRC32 that could cause problems (from cpanflute2): -find $RPM_BUILD_ROOT$perldir -type f -a \( -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' -find $RPM_BUILD_ROOT$perldir -type d -depth -exec rmdir {} 2>/dev/null ';' -popd >/dev/null 2>&1 %find_lang %{name} -# append String::CRC32 module files onto .lang files list: -find $RPM_BUILD_ROOT$perldir -type f | sed "s#$RPM_BUILD_ROOT##" >> %{name}.lang %clean rm -rf $RPM_BUILD_ROOT @@ -87,7 +65,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lftp/%{version}/proto-sftp.so %changelog -* Thu Dec 15 2005 Jason Vas Dias> - 3.3.5-1 +* Tue Dec 20 2005 Jason Vas Dias - 3.3.5-2 +- fix bug 176175: perl-String-CRC32 now in separate RPM + +* Thu Dec 15 2005 Jason Vas Dias - 3.3.5-1 - Upgrade to version 3.3.5 - fix bug bz172376 : host lookups should use any address found after timeout