- sed 2 patch

[packages/texinfo.git] / texinfo.spec

diff --git a/texinfo.spec b/texinfo.spec
index 3db5040bc513c2ea7b760e4b21363ea285f865ca..f49713eb68658051d41241672c7ae675ceec7f95 100644 (file)
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -16,11 +16,13 @@ Source0:    ftp://ftp.gnu.org/gnu/texinfo/%{name}-%{version}.tar.bz2
 # Source0-md5: 6ba369bbfe4afaa56122e65b3ee3a68c
 Source1:       info.desktop
 Patch0:                %{name}-info.patch
+Patch1:                %{name}-CVE-2005-3011.patch
+Patch2:                %{name}-as_needed-fix.patch
 URL:           http://texinfo.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.8
-BuildRequires: gettext-devel
 BuildRequires: gettext-autopoint >= 0.14.1
+BuildRequires: gettext-devel
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel
@@ -120,7 +122,7 @@ Summary(ru):        
 Summary(tr):   GNU texinfo belgeleri için tty tabanlý görüntüleyici
 Summary(uk):   ðÒÏÇÒÁÍÁ ÄÌÑ ÐÅÒÅÇÌÑÄÕ ÄÏËÕÍÅÎÔ¦× × ÆÏÒÍÁÔ¦ GNU texinfo ÎÁ ÔÅËÓÔÏ×ÏÍÕ ÔÅÒͦÎÁ̦
 Group:         Applications/System
-PreReq:                fix-info-dir
+Requires:      fix-info-dir
 Obsoletes:     info-install
 
 %description -n info
@@ -167,7 +169,8 @@ Summary(pl):        Narz
 Group:         Applications/Publishing
 Requires:      %{name} = %{version}-%{release}
 Requires:      tetex-fonts-latex
-Requires:      tetex-format-pdfetex
+# R: tetex 3.0 to avoid texi2pdf file conflict with tetex 2.0
+Requires:      tetex-format-pdfetex >= 1:3.0
 Requires:      tetex-format-plain
 
 %description texi2dvi
@@ -179,6 +182,8 @@ Narz
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p2
+%patch2 -p1
 
 # nb was added but outdated no not removed
 sed -i -e '/^no$/d' po/LINGUAS