Author: blues Date: Sun Mar 11 22:17:45 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- drop log support - wasn't working anyway; initial systemd
---- Files affected:
packages/openlldp:
openlldp-lldp.init (1.6 -> 1.7) , openlldp-lldp.sysconfig (1.2 -> 1.3) ,
openlldp.spec (1.10 -> 1.11)
---- Diffs:
================================================================
Index: packages/openlldp/openlldp-lldp.init
diff -u packages/openlldp/openlldp-lldp.init:1.6
packages/openlldp/openlldp-lldp.init:1.7
--- packages/openlldp/openlldp-lldp.init:1.6 Sun Mar 11 21:59:29 2012
+++ packages/openlldp/openlldp-lldp.init Sun Mar 11 23:17:40 2012
@@ -32,8 +32,7 @@
--pidfile /var/run/lldpd.pid \
--make-pidfile \
--exec /usr/sbin/lldpd -- \
- -d ${LLDP_DEBUG:-n} \
- >> ${LLDP_LOG_FILE:-/var/log/lldpd.log}
+ -d ${LLDP_DEBUG:-n}
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
touch /var/lock/subsys/lldpd
================================================================
Index: packages/openlldp/openlldp-lldp.sysconfig
diff -u packages/openlldp/openlldp-lldp.sysconfig:1.2
packages/openlldp/openlldp-lldp.sysconfig:1.3
--- packages/openlldp/openlldp-lldp.sysconfig:1.2 Tue Jan 22 13:39:19 2008
+++ packages/openlldp/openlldp-lldp.sysconfig Sun Mar 11 23:17:40 2012
@@ -12,5 +12,4 @@
# x : Enable EXCESSIVE debug flag.
LLDP_DEBUG="n"
-# Log file
-LLDP_LOG_FILE="/var/log/lldpd.log"
+LLDP_OPTS=""
================================================================
Index: packages/openlldp/openlldp.spec
diff -u packages/openlldp/openlldp.spec:1.10
packages/openlldp/openlldp.spec:1.11
--- packages/openlldp/openlldp.spec:1.10 Sun Mar 11 22:41:36 2012
+++ packages/openlldp/openlldp.spec Sun Mar 11 23:17:40 2012
@@ -1,6 +1,6 @@
# $Revision$, $Date$
%define subver alpha
-%define rel 0.1
+%define rel 0.3
Summary: Open Source implementation of IEEE 802.1AB
Summary(pl.UTF-8): Implementacja IEEE 802.1AB z otwartymi źródłami
Name: openlldp
@@ -8,11 +8,12 @@
Release: 0.%{subver}.%{rel}
License: GPL
Group: Networking
-Source0:
http://dl.sourceforge.net/openlldp/%{name}-%{version}%{subver}.tar.gz
-# Source0-md5: f48ffd632b96246cbf0f5c485dea3b01
+Source0:
http://dl.sourceforge.net/openlldp/%{name}-%{version}%{subver}.tar.bz2
+# Source0-md5: 68d11173cfaecd5ae00ec57a28d94ee5
Source1: %{name}-lldp.8
Source2: %{name}-lldp.init
Source3: %{name}-lldp.sysconfig
+Source4: %{name}-lldp.service
Patch0: %{name}-noproc.patch
Patch1: %{name}-bpf.patch
URL: http://openlldp.sourceforge.net/
@@ -58,23 +59,43 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_mandir}/man8}
+install -d
$RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_mandir}/man8,%{systemdunitdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man8/lldp.8
-cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/lldpd
+install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man8/lldp.8
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/lldpd
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/lldpd
+install %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}/lldpd.service
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+/sbin/chkconfig --add lldpd
+%service lldpd restart "OpenLLDP Daemon"
+%systemd_post lldpd.service
+
+%preun
+if [ "$1" = "0" ]; then
+ %service lldpd stop
+ /sbin/chkconfig --del lldpd
+fi
+%systemd_preun lldpd.service
+
+%postun
+%systemd_reload
+
+%triggerpostun -- openlldp < 0.4
+%systemd_trigger lldpd.service
+
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog LICENSE README
%attr(754,root,root) /etc/rc.d/init.d/lldpd
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/lldpd
+%{systemdunitdir}/lldpd.service
%attr(755,root,root) %{_sbindir}/lldpd
%attr(755,root,root) %{_bindir}/lldpneighbors
%{_mandir}/man8/*.8*
@@ -85,6 +106,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2012/03/11 22:17:40 blues
+- drop log support - wasn't working anyway; initial systemd
+
Revision 1.10 2012/03/11 21:41:36 blues
- 0.4alpha
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openlldp/openlldp-lldp.init?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openlldp/openlldp-lldp.sysconfig?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openlldp/openlldp.spec?r1=1.10&r2=1.11&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
