proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 12:37:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

distro: fix redhat/quagga.spec.in

Browse Source 
* quagga.spec.in: Add default for with_pimd macro.
  Remove ancient condtional on quagga_buildreqs.
  More recent rpmbuild complains about too many levels of recursion in
  quagga_buildreqs, so use %{expand:..}.
  Actually use quagga_buildreqs in BuildRequires!
  groff is needed for build.
  texi2html --number argument has disappeared, split into 2.

Acked-by: Donald Sharp <sharpd at cumulusnetworks.com>
(cherry picked from commit e07068c838142a127da8821afd660f075f7c35f8)
This commit is contained in:
Paul Jakma 2015-09-04 14:25:13 +01:00 committed by Daniel Walton
parent d81c7f12b4
commit 7c08d77fbc
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
redhat/quagga.spec.in
View File

@ -20,6 +20,7 @@
%{!?with_irdp: %define with_irdp 1 } %{!?with_irdp: %define with_irdp 1 }
%{!?with_rtadv: %define with_rtadv 1 } %{!?with_rtadv: %define with_rtadv 1 }
%{!?with_isisd: %define with_isisd 1 } %{!?with_isisd: %define with_isisd 1 }
%{!?with_pimd: %define with_pimd 1 }
%{!?with_shared: %define with_shared 1 } %{!?with_shared: %define with_shared 1 }
%{!?with_multipath: %define with_multipath 64 } %{!?with_multipath: %define with_multipath 64 }
%{!?quagga_user: %define quagga_user quagga } %{!?quagga_user: %define quagga_user quagga }
@ -44,23 +45,24 @@
%{!?dist: %define dist %{default_dist}} %{!?dist: %define dist %{default_dist}}
# as distros change packages we depend on, our Requires have to change, sadly. # as distros change packages we depend on, our Requires have to change, sadly.
%define quagga_buildreqs texi2html texinfo tetex autoconf pam-devel %define quagga_buildreqs texi2html texinfo autoconf pam-devel
%define quagga_buildreqs %{quagga_buildreqs} patch libcap-devel %define quagga_buildreqs %{expand:%{quagga_buildreqs}} patch libcap-devel
# FC4 and 5 split texi2html out of tetex package. # FC4 and 5 split texi2html out of tetex package.
%if "%dist" != "fc2" || "%dist" != "fc3" %define quagga_buildreqs %{expand:%{quagga_buildreqs}} texi2html
%define quagga_buildreqs %{quagga_buildreqs} texi2html
%endif
# pam_stack is deprecated in FC5 # pam_stack was deprecated in FC5
# default to pam_stack, default should be changed later. # default to pam_stack, default should be changed later.
%if "%dist" == "fc4" || "%dist" == "fc3" %if "%dist" == "fc4" || "%dist" == "fc3"
%define quagga_pam_source quagga.pam.stack %define quagga_pam_source quagga.pam.stack
%else %else
%define quagga_pam_source quagga.pam %define quagga_pam_source quagga.pam
%endif %endif
############################################################################
# man page probably needs groff for groff_ms macros
%define quagga_buildreqs %{expand:%{quagga_buildreqs}} groff
############################################################################
# misc internal defines # misc internal defines
%{!?quagga_uid: %define quagga_uid 92 } %{!?quagga_uid: %define quagga_uid 92 }
@ -103,7 +105,7 @@ Requires(pre): net-snmp
BuildRequires: readline readline-devel ncurses ncurses-devel BuildRequires: readline readline-devel ncurses ncurses-devel
Requires(pre): ncurses Requires(pre): ncurses
%endif %endif
BuildRequires: texinfo tetex autoconf pam-devel patch libcap-devel tetex BuildRequires: %{quagga_buildreqs}
# Initscripts > 5.60 is required for IPv6 support # Initscripts > 5.60 is required for IPv6 support
Requires(pre): initscripts >= 5.60 Requires(pre): initscripts >= 5.60
Requires(pre): ncurses pam Requires(pre): ncurses pam
@ -223,7 +225,7 @@ developing OSPF-API and quagga applications.
make %{?_smp_mflags} MAKEINFO="makeinfo --no-split" make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
pushd doc pushd doc
texi2html -number quagga.texi texi2html --number-footnotes --number-sections quagga.texi
popd popd
%install %install
@ -449,6 +451,10 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Fri Sep 4 2015 Paul Jakma <paul@jakma.org> - %{version}
- buildreq updates
- add a default define for with_pimd
* Thu Sep 12 2005 Paul Jakma <paul@dishone.st> * Thu Sep 12 2005 Paul Jakma <paul@dishone.st>
- Steal some changes from Fedora spec file: - Steal some changes from Fedora spec file:
- Add with_rtadv variable - Add with_rtadv variable