[xl2tpd/el6] * fixup cherrypick changelog butchering

Paul Wouters pwouters at fedoraproject.org
Tue Sep 18 18:33:57 UTC 2012


commit d4bde87a8fd206f983cd8c712b6db5f051d76a54
Author: Paul Wouters <paul at nohats.ca>
Date:   Tue Sep 18 14:10:49 2012 -0400

    * fixup cherrypick changelog butchering

 xl2tpd.spec |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/xl2tpd.spec b/xl2tpd.spec
index 47d1fcb..0b72898 100644
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@ -100,14 +100,10 @@ fi
 %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
 
 %changelog
-* Tue Sep 18 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-5
+* Tue Sep 18 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-4
 - Moved modprobe code from daemon to initscript/systemd
   (SElinux does not allow a daemon to do this, see rhbz#832149)
 
-* Tue Jul 10 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-4
-- No longer wait on the ppp package fix for pppol2tp plugin
-  so the other fixes can be pushed.
-
 * Tue Jun 12 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-6
 - Added patch for xl2tpd.conf to improve interop settings
   (no longer need to say "no encryption" on Windows)


More information about the scm-commits mailing list