-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
On 04/30/2015 03:09 AM, Andrew Gideon wrote:
> Timo:
Hi Andrew,
> I'm surprised you got as far as you did, but I've only actually
> built this - as opposed to using RPMs built by others - a couple of
> times.
>
> I found the same issue you did regarding "with_pimd". I solved
> this (differently than you; more details below), but then I hit a
> dependency issue. As of RHEL/CentOS 6, the tetex RPM has
> disappeared. It appears that texlive replaces it.
>
> I've now successfully built RPMs using both CentOS 6.6 and
> 7.1.1503.
>
> Here are my changes to the spec file for you to try:
>
> [tagonline@CentOS7GuestC quagga]$ diff -u
> /tmp/0.99.24.1-quagga.spec.in /tmp/0.99.24.1-andrew-quagga.spec.in
> --- /tmp/0.99.24.1-quagga.spec.in 2015-04-29 20:42:23.004388941
> -0400 +++ /tmp/0.99.24.1-andrew-quagga.spec.in 2015-04-29
> 20:42:46.795315014 -0400 @@ -20,6 +20,7 @@ %{!?with_irdp: %define
> with_irdp 1 } %{!?with_rtadv: %define with_rtadv 1 }
> %{!?with_isisd: %define with_isisd 1 } +%{!?with_pimd:
> %define
> with_pimd 1 } %{!?with_shared: %define with_shared 1 }
> %{!?with_multipath: %define with_multipath 64 } %{!?quagga_user:
> %define quagga_user quagga } @@ -44,7 +45,7 @@ %{!?dist:
> %define
> dist %{default_dist}}
>
> # 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
>
> # FC4 and 5 split texi2html out of tetex package. @@ -52,6 +53,16
> @@ %define quagga_buildreqs %{quagga_buildreqs} texi2html %endif
>
> +# Redhat 6 & 7 don't include tetex - There are probably Fedora
> versions +# for which this needs to be done as well. This code
> presumes that +# something other than rhel uses tetex. That's
> likely not always +# correct. +%if 0%{rhel} < 6 +%define
> quagga_buildreqs %{quagga_buildreqs} tetex +%else +%define
> quagga_buildreqs %{quagga_buildreqs} texlive +%endif + # pam_stack
> is deprecated in FC5 # default to pam_stack, default should be
> changed later. %if "%dist" == "fc4" || "%dist" == "fc3" @@ -103,7
> +114,18 @@ BuildRequires: readline readline-devel ncurses
> ncurses-devel Requires(pre): ncurses %endif -BuildRequires:
> texinfo tetex autoconf pam-devel patch libcap-devel tetex
> +BuildRequires: texinfo autoconf pam-devel patch libcap-devel + +#
> Redhat 6 & 7 don't include tetex - There are probably Fedora
> versions +# for which this needs to be done as well. This code
> presumes that +# something other than rhel uses tetex. That's
> likely not always +# correct. +%if 0%{rhel} < 6 +BuildRequires:
> tetex +%else +BuildRequires: texlive +%endif + # Initscripts > 5.60
> is required for IPv6 support Requires(pre): initscripts >= 5.60
> Requires(pre): ncurses pam [tagonline@CentOS7GuestC quagga]$
>
>
> This is built from changes to quagga.spec.in in git using the
> defined release procedure. This is still only in my local copy of
> the repository, of course. If and when this works for you, I'll
> post to the dev list for review.
thanks a lot! Works fine for me -- tested with
[tis@pptp-test ~]$ cat /etc/redhat-release
CentOS release 6.6 (Final)
[tis@pptp-test ~]$ uname -a
Linux pptp-test.bla.de 2.6.32-504.12.2.el6.x86_64 #1 SMP Wed Mar 11
22:03:14 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux
> - Andrew
Timo
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iF4EAREIAAYFAlVB6+gACgkQuSPmkPhAW0ppSgD/XIR21wov3+VGjJtAdoinw+G2
ndm559+CeJkCEvFrfQsA/0Y9auXg1AaUHI4yvu+L1gwlcsXBs1jaPplRr5eCARKz
=Dxq/
-----END PGP SIGNATURE-----
_______________________________________________
Quagga-users mailing list
Quagga-users@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-users
