[bird] spec: drop sysvinit subpackages
Michal Sekletar
msekleta at fedoraproject.org
Thu Oct 17 13:46:11 UTC 2013
commit f6e7b9e2094a33b0c71232ed80555c12c90d9eec
Author: Michal Sekletar <msekleta at redhat.com>
Date: Thu Oct 17 14:22:54 2013 +0200
spec: drop sysvinit subpackages
bird.spec | 38 ++++++--------------------------------
1 files changed, 6 insertions(+), 32 deletions(-)
---
diff --git a/bird.spec b/bird.spec
index 6829143..c8373c7 100644
--- a/bird.spec
+++ b/bird.spec
@@ -7,14 +7,14 @@ 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
+Source1: bird.service
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
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
@@ -29,6 +29,7 @@ Group: System Environment/Daemons
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
+Obsoletes: bird6-sysvinit
%description -n bird6
BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing
@@ -46,24 +47,6 @@ protocols BGP, RIP and OSPF.
This package contains documentation.
-%package sysvinit
-Summary: BIRD Internet Routing Daemon
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
-Requires(preun): /sbin/service
-
-%description sysvinit
-The bird-sysvinit contains SysV initscripts for bird and bird6 packages.
-
-%package -n bird6-sysvinit
-Summary: BIRD Internet Routing Daemon
-Group: System Environment/Daemons
-Requires: %{name}6 = %{version}-%{release}
-Requires(preun): /sbin/service
-
-%description -n bird6-sysvinit
-The bird-sysvinit contains SysV initscripts for bird and bird6 packages.
-
%prep
%setup -q
@@ -97,13 +80,9 @@ cd ipv6
make install DESTDIR=$RPM_BUILD_ROOT
cd ..
-install -d $RPM_BUILD_ROOT%{_initddir}
-sed 's/BIRD_PROGNAME/bird/' %SOURCE1 > $RPM_BUILD_ROOT%{_initddir}/bird
-sed 's/BIRD_PROGNAME/bird6/' %SOURCE1 > $RPM_BUILD_ROOT%{_initddir}/bird6
-
install -d $RPM_BUILD_ROOT%{_unitdir}
-sed 's/BIRD_PROGNAME/bird/' %SOURCE2 > $RPM_BUILD_ROOT%{_unitdir}/bird.service
-sed 's/BIRD_PROGNAME/bird6/' %SOURCE2 > $RPM_BUILD_ROOT%{_unitdir}/bird6.service
+sed 's/BIRD_PROGNAME/bird/' %SOURCE1 > $RPM_BUILD_ROOT%{_unitdir}/bird.service
+sed 's/BIRD_PROGNAME/bird6/' %SOURCE1 > $RPM_BUILD_ROOT%{_unitdir}/bird6.service
%clean
@@ -171,18 +150,13 @@ fi
%doc NEWS README TODO
%doc doc/bird*.html
-%files sysvinit
-%attr(755,root,root) %{_initddir}/bird
-
-%files -n bird6-sysvinit
-%attr(755,root,root) %{_initddir}/bird6
-
%changelog
* Thu Oct 17 2013 Michal Sekletar <msekleta at redhat.com> - 1.3.11-1
- update to 1.3.11
- add systemd to BuildRequires
- change scriptlet Requires to systemd
- drop rpm triggers used for migration from sysv to systemd
+- drop sysvinit subpackages
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list