[bird/epel7: 15/16] Merge branch 'master' into epel7

[Michal Sekletar]

commit cb0a9bada84663aa244b8433420d21904b5f1e7e
Merge: 4c0f325 a8644fb
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Tue Apr 1 14:00:30 2014 +0200

    Merge branch 'master' into epel7
    
    Conflicts:
    	.gitignore
    	bird.spec
    	sources

 .gitignore   |    2 +
 bird.init    |   97 ------------------------------------
 bird.service |    3 +-
 bird.spec    |  154 +++++++++++++++++++++-------------------------------------
 sources      |    3 +-
 5 files changed, 60 insertions(+), 199 deletions(-)
---
diff --cc bird.spec
index b06aedd,7c92564..6269327
--- a/bird.spec
+++ b/bird.spec
@@@ -1,23 -1,21 +1,20 @@@
- #unitdir is not defined in current rpm
- %define         _unitdir /lib/systemd/system
- 
- Name:           bird
- Version:        1.3.10
- Release:       	1%{?dist}
- Summary:        BIRD Internet Routing Daemon
- 
- Group:          System Environment/Daemons
- License:        GPLv2+
- URL:            http://bird.network.cz
- Source0:        ftp://bird.network.cz/pub/bird/bird-%{version}.tar.gz
- Source1:        bird.init
- Source2:        bird.service
- BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
- BuildRequires:  flex bison ncurses-devel readline-devel sed
- Requires(post): systemd-units
- Requires(preun):systemd-units
- Requires(postun):   systemd-units
+ %global _hardened_build 1
+ 
+ Name:             bird
+ Version:          1.4.0
+ Release:          1%{?dist}
+ Summary:          BIRD Internet Routing Daemon
+ 
+ Group:            System Environment/Daemons
+ License:          GPLv2+
+ URL:              http://bird.network.cz
+ Source0:          ftp://bird.network.cz/pub/bird/bird-%{version}.tar.gz
+ Source1:          bird.service
+ 
+ BuildRequires:    flex bison ncurses-devel readline-devel sed systemd
+ Requires(post):   systemd
+ Requires(preun):  systemd
+ Requires(postun): systemd
 -Obsoletes:        bird-sysvinit
  
  %description
  BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing
diff --cc sources
index c181e5e,b70a05b..0f44d9a
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
- 553c331b32bca9e926519cb2f67d68be  bird-1.3.10.tar.gz
+ 4e5a47308335b1b0bf4691cac6c4174f  bird-1.4.0.tar.gz
++