From 46b7240de2756a97021cdd42b2b3ea3a6f5259cb Mon Sep 17 00:00:00 2001
From: Tomasz Pala <gotar@pld-linux.org>
Date: Sun, 7 Mar 2010 11:59:14 +0000
Subject: [PATCH 1/1] - upgraded to 1.2.1, added postscript docs and some minor
 fixes;   (please verify 64bit patch against filter/config.Y)

Changed files:
    bird-64bit.patch -> 1.2
    bird.spec -> 1.43
---
 bird-64bit.patch | 33 +--------------------------------
 bird.spec        | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/bird-64bit.patch b/bird-64bit.patch
index 2ee431e..74bbc3f 100644
--- a/bird-64bit.patch
+++ b/bird-64bit.patch
@@ -1,13 +1,12 @@
 diff -dur -x '*~' bird-1.0.11.orig/conf/conf.h bird-1.0.11/conf/conf.h
 --- bird-1.0.11.orig/conf/conf.h	2000-06-04 21:30:13.000000000 +0200
 +++ bird-1.0.11/conf/conf.h	2005-07-22 15:30:41.000000000 +0200
-@@ -75,7 +75,7 @@
    struct symbol *next;
    struct sym_scope *scope;
    int class;
 -  int aux;
 +  long aux;
-   void *aux2; 
+   void *aux2;
    void *def;
    char name[1];
 diff -dur -x '*~' bird-1.0.11.orig/conf/confbase.Y bird-1.0.11/conf/confbase.Y
@@ -22,36 +21,6 @@ diff -dur -x '*~' bird-1.0.11.orig/conf/confbase.Y bird-1.0.11/conf/confbase.Y
    u32 i32;
    ip_addr a;
    struct symbol *s;
-diff -dur -x '*~' bird-1.0.11.orig/filter/config.Y bird-1.0.11/filter/config.Y
---- bird-1.0.11.orig/filter/config.Y	2004-05-31 19:44:39.000000000 +0200
-+++ bird-1.0.11/filter/config.Y	2005-07-22 15:29:16.000000000 +0200
-@@ -97,7 +97,7 @@
- decls: /* EMPTY */ { $$ = NULL; }
-  | one_decl ';' decls {
-      $$ = $1;
--     $$->aux = (int) $3;
-+     $$->aux = (long) $3;
-    }
-  ;
- 
-@@ -105,7 +105,7 @@
- declsn: one_decl { $$ = $1; }
-  | declsn ';' one_decl {
-      $$ = $1;
--     $$->aux = (int) $3;
-+     $$->aux = (long) $3;
-    }
-  ;
- 
-@@ -168,7 +168,7 @@
-      cf_push_scope($2);
-    } function_params function_body {
-      $2->def = $5;
--     $2->aux = (int) $4;
-+     $2->aux = (long) $4;
-      $2->aux2 = $5;
-      DBG("Hmm, we've got one function here - %s\n", $2->name); 
-      cf_pop_scope();
 diff -dur -x '*~' bird-1.0.11.orig/filter/filter.h bird-1.0.11/filter/filter.h
 --- bird-1.0.11.orig/filter/filter.h	2000-05-30 12:42:39.000000000 +0200
 +++ bird-1.0.11/filter/filter.h	2005-07-22 15:30:18.000000000 +0200
diff --git a/bird.spec b/bird.spec
index 1b2383e..23c4b9f 100644
--- a/bird.spec
+++ b/bird.spec
@@ -5,19 +5,21 @@
 %bcond_without	ipv6	# disable IPv6 support (and building bird-ipv6 package)
 %bcond_without	ipv4	# disable IPv4 support (and building bird-ipv4 package)
 #
-Summary:	Routing daemon
-Summary(pl.UTF-8):	Demon dynamicznego routingu
+Summary:	The BIRD Internet Routing Daemon
+Summary(pl.UTF-8):	Demon BIRD Internetowego Routingu Dynamicznego
 Name:		bird
-Version:	1.0.12
+Version:	1.2.1
 Release:	1
-License:	GPL
+License:	GPL v2+
 Group:		Networking/Daemons
 Source0:	ftp://bird.network.cz/pub/bird/%{name}-%{version}.tar.gz
-# Source0-md5:	f404bde9b664ef801a81c7bdc784ec7c
+# Source0-md5:	e158bd0a72e345841e39764975ee1d21
 Source1:	%{name}-ipv4.init
 Source2:	%{name}-ipv4.sysconfig
 Source3:	%{name}-ipv6.init
 Source4:	%{name}-ipv6.sysconfig
+Source5:	ftp://bird.network.cz/pub/bird/%{name}-doc-%{version}.tar.gz
+# Source5-md5:	a82474c87f5c79f29a6c9088f9dfe30a
 Patch0:		%{name}-64bit.patch
 URL:		http://bird.network.cz/
 BuildRequires:	autoconf
@@ -100,14 +102,16 @@ protokołów routingu, łatwym interfejsem konfiguracji i językiem
 filtrów o dużych możliwościach.
 
 %prep
-%setup -q
+%setup -q -a 5
 %patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.* tools
+%{__autoconf}
+
+export CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
 
 %if %{with ipv6}
-%{__autoconf}
 %configure \
 	--disable-memcheck \
 	--enable-client \
@@ -175,7 +179,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc/*.html TODO README
+%doc doc/*.html doc/reply_codes %{name}-doc-%{version}/doc/*.ps ChangeLog NEWS README TODO
 %attr(755,root,root) %{_sbindir}/birdc
 
 %if %{with ipv4}
-- 
2.44.0