SPECS: lftp.spec - seds moved to patches

sparky sparky at pld-linux.org
Wed Aug 2 01:27:19 CEST 2006


Author: sparky                       Date: Tue Aug  1 23:27:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- seds moved to patches

---- Files affected:
SPECS:
   lftp.spec (1.219 -> 1.220) 

---- Diffs:

================================================================
Index: SPECS/lftp.spec
diff -u SPECS/lftp.spec:1.219 SPECS/lftp.spec:1.220
--- SPECS/lftp.spec:1.219	Mon Jul 31 19:58:58 2006
+++ SPECS/lftp.spec	Wed Aug  2 01:27:14 2006
@@ -31,6 +31,9 @@
 Source2:	%{name}.desktop
 Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-pl.po-update.patch
+Patch2:		%{name}-makefile.patch
+Patch3:		%{name}-gettext-m4.patch
+Patch4:		%{name}-as_needed-fix.patch
 URL:		http://lftp.yar.ru/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -41,7 +44,6 @@
 BuildRequires:	ncurses-devel >= 5.2
 %{?with_openssl:BuildRequires:	openssl-devel >= 0.9.7d}
 BuildRequires:	readline-devel >= 4.2
-BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_gcc_ver	%(%{__cc} -dumpversion | cut -b 1)
@@ -79,16 +81,13 @@
 %setup -q
 #%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 rm -f po/stamp-po
 
-sed -i -e 's#pkgverlibdir.*=.*#pkgverlibdir = $(pkglibdir)#g' src/Makefile*
-# for gettext >= 0.14.2
-sed -i -e 's/jm_AC/gl_AC/' m4/human.m4
-
 %{!?with_gnutls:echo 'AC_DEFUN([AM_PATH_LIBGNUTLS],[/bin/true])' > m4/gnutls.m4}
 
-sed -i '/liblftp_tasks_la_LIBADD/a\\nliblftp_jobs_la_LIBADD = liblftp-tasks.la' -i src/Makefile.am
-
 %build
 %{__libtoolize}
 %{__gettextize}
@@ -147,6 +146,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.220  2006/08/01 23:27:14  sparky
+- seds moved to patches
+
 Revision 1.219  2006/07/31 17:58:58  sparky
 - link liblftp_jobs.so with liblftp_tasks.so - as-needed build fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/lftp.spec?r1=1.219&r2=1.220&f=u



More information about the pld-cvs-commit mailing list