Accepting request 227705 from network:fcoe
- Fix VEPA migration issue (bnc#866282) - Remove mkinitrd support - Use bzip2 for open-lldp-git-update.patch * Add open-lldp-git-update.patch.bz2 * Delete open-lldp-git-update.patch (forwarded request 227010 from hreinecke) OBS-URL: https://build.opensuse.org/request/show/227705 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-lldp?expand=0&rev=3
This commit is contained in:
commit
3a68ee99aa
File diff suppressed because it is too large
Load Diff
3
open-lldp-git-update.patch.bz2
Normal file
3
open-lldp-git-update.patch.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:0a639f549eef3d59d67c84a6cbe28767cdfea887050e054a2f3f23c4f72523ab
|
||||||
|
size 137330
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 21 15:28:19 CET 2014 - hare@suse.de
|
||||||
|
|
||||||
|
- Fix VEPA migration issue (bnc#866282)
|
||||||
|
- Remove mkinitrd support
|
||||||
|
- Use bzip2 for open-lldp-git-update.patch
|
||||||
|
* Add open-lldp-git-update.patch.bz2
|
||||||
|
* Delete open-lldp-git-update.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 19 12:52:45 CET 2013 - hare@suse.de
|
Tue Nov 19 12:52:45 CET 2013 - hare@suse.de
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package open-lldp
|
# spec file for package open-lldp
|
||||||
#
|
#
|
||||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -32,16 +32,12 @@ BuildRequires: pkgconfig
|
|||||||
BuildRequires: readline-devel
|
BuildRequires: readline-devel
|
||||||
Url: http://open-lldp.org/
|
Url: http://open-lldp.org/
|
||||||
Source: http://ftp-osl.osuosl.org/pub/%{name}/%{name}-%{version}.tar.gz
|
Source: http://ftp-osl.osuosl.org/pub/%{name}/%{name}-%{version}.tar.gz
|
||||||
Source20: mkinitrd-boot.sh
|
Patch0: %{name}-git-update.patch.bz2
|
||||||
Source22: mkinitrd-setup.sh
|
|
||||||
Patch0: %{name}-git-update.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Provides: dcbd = %{version}
|
Provides: dcbd = %{version}
|
||||||
Obsoletes: dcbd < %{version}
|
Obsoletes: dcbd < %{version}
|
||||||
Provides: lldpad = %{version}
|
Provides: lldpad = %{version}
|
||||||
Obsoletes: lldpad < %{version}
|
Obsoletes: lldpad < %{version}
|
||||||
Requires(post): mkinitrd
|
|
||||||
Requires(postun): mkinitrd
|
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
%systemd_requires
|
%systemd_requires
|
||||||
|
|
||||||
@ -88,15 +84,11 @@ make check %{?_smp_mflags}
|
|||||||
%install
|
%install
|
||||||
mkdir -p %{buildroot}/var/lib/lldpad
|
mkdir -p %{buildroot}/var/lib/lldpad
|
||||||
%makeinstall
|
%makeinstall
|
||||||
install -d %{buildroot}/lib/mkinitrd/scripts/
|
|
||||||
install -m 755 %{S:20} %{buildroot}/lib/mkinitrd/scripts/boot-lldpad.sh
|
|
||||||
install -m 755 %{S:22} %{buildroot}/lib/mkinitrd/scripts/setup-lldpad.sh
|
|
||||||
# remove la archives
|
# remove la archives
|
||||||
rm -rf %{buildroot}/%{_libdir}/*.la
|
rm -rf %{buildroot}/%{_libdir}/*.la
|
||||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rclldpad
|
ln -s service %{buildroot}%{_sbindir}/rclldpad
|
||||||
|
|
||||||
%post
|
%post
|
||||||
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
|
|
||||||
%{fillup_and_insserv -n -i lldpad}
|
%{fillup_and_insserv -n -i lldpad}
|
||||||
%service_add_post lldpad.service
|
%service_add_post lldpad.service
|
||||||
|
|
||||||
@ -104,7 +96,6 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rclldpad
|
|||||||
%service_del_preun lldpad.service
|
%service_del_preun lldpad.service
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
|
|
||||||
%{insserv_cleanup lldpad}
|
%{insserv_cleanup lldpad}
|
||||||
|
|
||||||
%post -n %libname -p /sbin/ldconfig
|
%post -n %libname -p /sbin/ldconfig
|
||||||
@ -119,7 +110,6 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rclldpad
|
|||||||
%{_sbindir}/*
|
%{_sbindir}/*
|
||||||
%{_mandir}/man8/*
|
%{_mandir}/man8/*
|
||||||
%config /etc/bash_completion.d/*
|
%config /etc/bash_completion.d/*
|
||||||
/lib/mkinitrd
|
|
||||||
|
|
||||||
%files -n %libname
|
%files -n %libname
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
Loading…
Reference in New Issue
Block a user