diff --git a/w3m-0.5.2-fix_version_in_manpage.patch b/w3m-0.5.2-fix_version_in_manpage.patch new file mode 100644 index 0000000..94d8fd1 --- /dev/null +++ b/w3m-0.5.2-fix_version_in_manpage.patch @@ -0,0 +1,11 @@ +--- doc/w3m.1-old 2002-11-12 18:06:30.000000000 +0530 ++++ doc/w3m.1 2010-08-02 10:19:11.000000000 +0530 +@@ -171,7 +171,7 @@ $ cat foo.html | w3m -dump -T text/html + This is the + .I + w3m +-0.2.1 Release. ++0.5.2 Release. + .PP + Additional information about + .I diff --git a/w3m.spec b/w3m.spec index 9b9e486..ff662c4 100644 --- a/w3m.spec +++ b/w3m.spec @@ -5,10 +5,9 @@ Name: w3m Version: 0.5.2 -Release: 18%{?dist} +Release: 19%{?dist} License: MIT URL: http://w3m.sourceforge.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2 findutils sed ncurses-devel BuildRequires: openssl-devel BuildRequires: pkgconfig @@ -38,6 +37,7 @@ Patch3: bug_555467_FTBFS.patch Patch4: bug_566101_Fix-DSO-X11.patch Patch5: w3m-0.5.2-nulcn.patch Patch6: w3m-0.5.2-ssl_verify_server_on.patch +Patch7: w3m-0.5.2-fix_version_in_manpage.patch Summary: A pager with Web browsing abilities Group: Applications/Internet @@ -79,6 +79,7 @@ chmod 755 doc-jp %patch4 -p0 %patch5 -p1 %patch6 -p1 +%patch7 -p0 %if %{with_utf8} pushd doc-jp @@ -111,29 +112,24 @@ popd %{?_with_lynx_keymap:--enable-keymap=lynx} \ %{!?_with_lynx_keymap:--enable-keymap=w3m} -%{__make} # %{?_smp_mflags} +make # %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/w3m +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/w3m install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/w3m/config rm -f doc*/w3m.1 %find_lang w3m -%clean -rm -rf $RPM_BUILD_ROOT - %files -f w3m.lang %defattr(-, root, root, -) %doc NEWS %doc doc %lang(ja) %doc doc-jp -## %doc README.img %{_datadir}/w3m/ %config(noreplace) %{_sysconfdir}/w3m/ %{_bindir}/w3m* @@ -144,10 +140,13 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libexecdir}/w3m/w3mimgdisplay %files img -%defattr(-, root, root) +%defattr(-, root, root,-) %{_libexecdir}/w3m/w3mimgdisplay %changelog +* Tue Sep 28 2010 Parag - 0.5.1-19 +- Resolves:rh#638026 - Man w3m is stating incorrect program version + * Thu Jun 17 2010 Parag - 0.5.2-18 - Resolves:rh#604864-CVE-2010-2074 w3m: doesn't handle NULL in Common Name properly