ihrachyshka pushed to dibbler (epel7). "Merge branch 'master' into epel7"

[notifications at fedoraproject.org]

>From 59dff46a4a631ab692fbc8f8ea8fd60e3698d9e6 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys at redhat.com>
Date: Tue, 7 Apr 2015 13:08:59 +0200
Subject: Fixed rpmlint warning due to using %-substitution in changelog


diff --git a/dibbler.spec b/dibbler.spec
index 70427ac..51290f9 100644
--- a/dibbler.spec
+++ b/dibbler.spec
@@ -158,7 +158,7 @@ done
 * Thu Apr 2 2015 Ihar Hrachyshka <ihrachys at redhat.com> - 1.0.1-0.RC1.1
 - removed dibbler-common package, instead put _sharedstatedir in each package
   that needs it.
-- added %check section (disabled for now due to upstream bug).
+- added check section (disabled for now due to upstream bug).
 - cleaned up scripts and examples for non-Linux platforms.
 - removed Group tags.
 - build -docs package as noarch.
-- 
cgit v0.10.2


>From 97281ffdd815b2d5bcaef4431911320b87bbc836 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys at redhat.com>
Date: Tue, 7 Apr 2015 13:08:18 +0200
Subject: Added examples/scripts directories to -docs package

Otherwise they are not cleaned up when the package is removed.

Also made sure /etc/dibbler is cleaned up too.

diff --git a/dibbler.spec b/dibbler.spec
index 51290f9..42d53fc 100644
--- a/dibbler.spec
+++ b/dibbler.spec
@@ -7,7 +7,7 @@ granting) autoconfiguration for IPv6.
 
 Name:		dibbler
 Version:	1.0.1
-Release:	0.%{milestone}.1%{?dist}
+Release:	0.%{milestone}.2%{?dist}
 Summary:	Portable DHCPv6 implementation
 
 BuildRequires:	gtest-devel
@@ -119,6 +119,7 @@ done
 %license LICENSE
 %{_sbindir}/dibbler-client
 %{_mandir}/man8/dibbler-client.8*
+%dir %{_sysconfdir}/dibbler
 %config(noreplace) %{_sysconfdir}/dibbler/client.conf
 %dir %{_sharedstatedir}/dibbler
 
@@ -127,6 +128,7 @@ done
 %license LICENSE
 %{_sbindir}/dibbler-relay
 %{_mandir}/man8/dibbler-relay.8*
+%dir %{_sysconfdir}/dibbler
 %config(noreplace) %{_sysconfdir}/dibbler/relay.conf
 %dir %{_sharedstatedir}/dibbler
 
@@ -141,20 +143,27 @@ done
 %license LICENSE
 %{_sbindir}/dibbler-server
 %{_mandir}/man8/dibbler-server.8*
+%dir %{_sysconfdir}/dibbler
 %config(noreplace) %{_sysconfdir}/dibbler/server.conf
 %dir %{_sharedstatedir}/dibbler
 
 
 %files docs
 %license LICENSE
+%dir %{_pkgdocdir}
 %{_pkgdocdir}/CHANGELOG
 %{_pkgdocdir}/RELNOTES
 %{_pkgdocdir}/dibbler-user.pdf
+%dir %{_pkgdocdir}/examples
+%dir %{_pkgdocdir}/scripts
 %{_pkgdocdir}/examples/*.conf
 %{_pkgdocdir}/scripts/*
 
 
 %changelog
+* Tue Apr 7 2015 Ihar Hrachyshka <ihrachys at redhat.com> - 1.0.1-0.RC1.2
+- package examples and scripts directories into -docs package.
+
 * Thu Apr 2 2015 Ihar Hrachyshka <ihrachys at redhat.com> - 1.0.1-0.RC1.1
 - removed dibbler-common package, instead put _sharedstatedir in each package
   that needs it.
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/dibbler.git/commit/?h=epel7&id=1e76da711abf258f82f8e6be3763dc3c915f24cf