#2 Various enhancements to BIRD package
Closed 2 years ago by ersin. Opened 2 years ago by robert.
Unknown source master  into  master

file added
+14
@@ -0,0 +1,14 @@

+ Downstream-only patch by Robert Scheck <robert@fedoraproject.org> for BIRD <= 2.0.2

+ to re-enable building of HTML and PDF documentation. Proposed to BIRD upstream via

+ http://trubka.network.cz/pipermail/bird-users/2018-November/012895.html

+ 

+ --- bird-2.0.2/doc/LinuxDocTools.pm		2018-01-16 10:46:06.000000000 +0100

+ +++ bird-2.0.2/doc/LinuxDocTools.pm.doc		2018-11-25 15:36:21.068378345 +0100

+ @@ -242,6 +242,7 @@ sub process_options

+    #   removes iso-entites sub directory after doing make install.)

+    #

+    $ENV{SGML_CATALOG_FILES} .= (defined $ENV{SGML_CATALOG_FILES} ? ":" : "") .

+ +     "$main::prefix/share/sgml/sgml-iso-entities-8879.1986/catalog:";

+       "$main::prefix/share/sgml/entities/sgml-iso-entities-8879.1986/catalog";

+    $ENV{SGML_CATALOG_FILES} .= ":$main::DataDir/linuxdoc-tools.catalog";

+    $ENV{SGML_CATALOG_FILES} .= ":$main::/etc/sgml.catalog";

file modified
+53 -36
@@ -2,67 +2,72 @@

  

  Name:             bird

  Version:          2.0.2

- Release:          4%{?dist}

+ Release:          6%{?dist}

  Summary:          BIRD Internet Routing Daemon

  

- Group:            System Environment/Daemons

  License:          GPLv2+

- URL:              http://bird.network.cz

+ URL:              https://bird.network.cz/

  Source0:          ftp://bird.network.cz/pub/bird/bird-%{version}.tar.gz

  Source1:          bird.service

+ Patch0:           bird-2.0.2-doc.patch

+ 

+ BuildRequires:    flex bison ncurses-devel readline-devel sed gcc

+ 

+ BuildRequires:    systemd-rpm-macros

+ %{?systemd_requires}

+ Requires(pre):    shadow-utils

  

- BuildRequires:    flex bison ncurses-devel readline-devel sed systemd gcc

- Requires(pre):    /usr/sbin/useradd

- Requires(post):   systemd

- Requires(preun):  systemd

- Requires(postun): systemd

  Obsoletes:        bird-sysvinit

  Obsoletes:        bird6 < 2.0.2-1

  Provides:         bird6 = %{version}-%{release}

  

  %description

- BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing

- protocols BGP, RIP and OSPF.

- 

- This package contains both IPv4 and IPv6 support.

- 

+ BIRD is a dynamic IP routing daemon supporting both, IPv4 and IPv6, Border

+ Gateway Protocol (BGPv4), Routing Information Protocol (RIPv2, RIPng), Open

+ Shortest Path First protocol (OSPFv2, OSPFv3), Babel Routing Protocol (Babel),

+ Bidirectional Forwarding Detection (BFD), IPv6 router advertisements, static

+ routes, inter-table protocol, command-line interface allowing on-line control

+ and inspection of the status of the daemon, soft reconfiguration as well as a

+ powerful language for route filtering.

  

  %package doc

- Summary:          BIRD Internet Routing Daemon

- Group:            System Environment/Daemons

+ Summary:          Documentation for BIRD Internet Routing Daemon

+ BuildRequires:    linuxdoc-tools sgml-common

  BuildArch:        noarch

  

  %description doc

- BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing

- protocols BGP, RIP and OSPF.

- 

- This package contains documentation.

+ Documentation for users and programmers of the BIRD Internet Routing Daemon.

  

+ BIRD is a dynamic IP routing daemon supporting both, IPv4 and IPv6, Border

+ Gateway Protocol (BGPv4), Routing Information Protocol (RIPv2, RIPng), Open

+ Shortest Path First protocol (OSPFv2, OSPFv3), Babel Routing Protocol (Babel),

+ Bidirectional Forwarding Detection (BFD), IPv6 router advertisements, static

+ routes, inter-table protocol, command-line interface allowing on-line control

+ and inspection of the status of the daemon, soft reconfiguration as well as a

+ powerful language for route filtering.

  

  %prep

  %setup -q

+ %patch0 -p1 -b .doc

  

  

  %build

- %configure --prefix=%{_prefix} \

-            --sysconfdir=%{_sysconfdir} \

-            --localstatedir=%{_localstatedir}

- make %{?_smp_mflags}

+ %configure

+ %make_build all docs

+ 

+ %install

+ %make_install

+ 

+ install -d %{buildroot}%{_localstatedir}/lib/bird

+ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/bird.service

  

  %pre

  getent group bird >/dev/null || groupadd -r bird

  getent passwd bird >/dev/null || \

- 	useradd -r -g bird -d %{_localstatedir}/lib/bird -s /sbin/nologin \

- 	-c "bird daemon user" bird

+   useradd -r -g bird -d %{_localstatedir}/lib/bird -s /sbin/nologin \

+   -c "BIRD daemon user" bird

  exit 0

  

- %install

- make install DESTDIR=%{buildroot}

- 

- install -d %{buildroot}%{_unitdir}

- install -d %{buildroot}%{_localstatedir}/lib/bird

- install -m644 %{SOURCE1} %{buildroot}%{_unitdir}/bird.service

- 

  %post

  %systemd_post bird.service

  
@@ -75,7 +80,7 @@

  

  %files

  %doc NEWS README

- %config(noreplace) %{_sysconfdir}/bird.conf

+ %attr(0640,root,bird) %config(noreplace) %{_sysconfdir}/bird.conf

  %{_unitdir}/bird.service

  %{_sbindir}/bird

  %{_sbindir}/birdc
@@ -84,13 +89,25 @@

  

  %files doc

  %doc NEWS README

- # Disabling html content as sgml2html is currently generating ton of failures

- # %doc doc/bird*.html

- %doc doc/*.sgml

  %doc doc/bird.conf.*

+ %doc obj/doc/bird*.html

+ %doc obj/doc/bird.pdf

+ %doc obj/doc/prog*.html

+ %doc obj/doc/prog.pdf

  

  

  %changelog

+ * Sun Nov 25 2018 Robert Scheck <robert@fedoraproject.org> - 2.0.2-6

+ - More modernizations and cleanups of spec file (#1653088 #c1)

+ 

+ * Sun Nov 25 2018 Robert Scheck <robert@fedoraproject.org> - 2.0.2-5

+ - Modernization and cleanup of spec file

+ - Ship PDF and HTML documentation rather SGML documentation

+ - Ensure /etc/bird.conf can be only read by BIRD user

+ 

+ * Tue Nov 20 2018 Stanislav Kozina <skozina@redhat.com> - 2.0.2-4

+ - Fix bird6 Provides and Obsoletes (#1524385 #c11)

+ 

  * Mon Nov 19 2018 Stanislav Kozina <skozina@redhat.com> - 2.0.2-3

  - Obsolete bird6 and make bird-doc noarch package

  

  • Modernization and cleanup of spec file
  • Ship PDF and HTML documentation rather SGML documentation
  • Ensure /etc/bird.conf can be only read by BIRD user

1 new commit added

  • More modernizations and cleanups of spec file (#1653088 #c1)
2 years ago

1 new commit added

  • Build the documentation using (almost) the correct way
2 years ago

Merged, closing. Thank you!

Pull-Request has been closed by ersin

2 years ago