Ticket #1848: 0001-Fixed-forgotten-PCRE-dependency-for-EL5.patch

File 0001-Fixed-forgotten-PCRE-dependency-for-EL5.patch, 2.5 KB (added by zaytsev, 14 years ago)

  • contrib/dist/redhat/mc.spec.in 

    From 5206642072a3e65aa47cba81c9d08856ee2f7bd1 Mon Sep 17 00:00:00 2001
From: Yury V. Zaytsev <yury@shurup.com>
Date: Sat, 28 Nov 2009 22:08:48 +0100
Subject: [PATCH] Fixed forgotten PCRE dependency for EL5.

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
---
 contrib/dist/redhat/mc.spec.in |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/contrib/dist/redhat/mc.spec.in b/contrib/dist/redhat/mc.spec.in
index 2d87df6..9d1a9e1 100644
    a b URL: http://www.midnight-commander.org/ 
    3232BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
    3333BuildRequires:  e2fsprogs-devel gpm-devel 
    3434 
     35%if %{legacy_rhel}%{?el5} 
     36BuildRequires:  pcre-devel 
     37%endif 
     38 
    3539%if %{legacy_rhel} 
    3640 
    37 BuildRequires:  pcre-devel ncurses-devel 
     41BuildRequires:  ncurses-devel 
    3842 
    3943# From Glib 
    40 BuildRequires:  pkgconfig 
    41 BuildRequires:  gettext 
     44BuildRequires:  pkgconfig gettext 
    4245 
    4346%else 
    4447BuildRequires:  glib2-devel slang-devel 
    … … rm -rf $RPM_BUILD_ROOT 
    150153 
    151154%changelog 
    152155* Fri Nov 27 2009 Yury V. Zaytsev <yury@shurup.com> 
    153 - Rewritten and simplified static build procedure. 
     156- Fixed debug info generation for legacy distros 
     157- Rewritten and simplified static build procedure 
    154158 
    155159* Mon Oct 26 2009 Andrew Borodin <aborodin@vmail.ru> 
    156 - Add new %%{_sysconfdir}/mc/mc.keymap.* files. 
     160- Added new %%{_sysconfdir}/mc/mc.keymap.* files 
    157161 
    158162* Fri Sep 04 2009 Slava Zanko <slavazanko@gmail.com> 
    159163- Add new file %%{_sysconfdir}/mc/filehighlight.ini 
    160164 
    161165* Sat Aug 01 2009 Yury V. Zaytsev <yury@shurup.com> 
    162166- Fixed EL4 (and supposedly EL3) builds 
    163 - Fixed some of rpmlint warnings 
     167- Fixed some of the rpmlint warnings 
    164168 
    165169* Sat Jul 04 2009 Yury V. Zaytsev <yury@shurup.com> 
    166170- Fix the issue when wrappers were left unpackaged 
    … … rm -rf $RPM_BUILD_ROOT 
    169173- Fix install patches: use %%{_sysconfdir}/mc directory 
    170174 
    171175* Fri May 8 2009 Slava Zanko <slavazanko@gmail.com> 
    172 - Review spec-file to build on the current distributions 
    173 - Change build rules 
    174 - Fix install pathes 
     176- Reviewed spec-file to build on the current distributions 
     177- Changed build rules 
     178- Fixed install paths 
    175179 
    176180* Fri Jun 22 2007 Pavel Roskin <proski@gnu.org> 
    177 - Make cons.saver suid vcsa, it's needed for Fedora 7 
     181- Made cons.saver suid vcsa, it's needed for Fedora 7 
    178182 
    179183* Thu Dec 21 2006 Pavel Roskin <proski@gnu.org> 
    180184- Don't rely on brace expansion, it may be disabled