Attachment 581129 Details for Bug 817442 – [7/9] Only install configuration samples in /usr/share/doc (not /etc/quagga)

[patch] [7/9] Only install configuration samples in /usr/share/doc (not /etc/quagga)

Only-install-config-samples-in-usr-share-doc.patch (text/plain), 1.49 KB, created by David Ward on 2012-04-30 03:26:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Ward

Created: 2012-04-30 03:26:01 UTC

Size: 1.49 KB

patch

obsolete

>From 0df66acf32ace261c18126cf0fb080a915a53842 Mon Sep 17 00:00:00 2001
>From: David Ward <david.ward@ll.mit.edu>
>Date: Sat, 21 Apr 2012 21:31:58 -0400
>Subject: [PATCH 7/9] Only install configuration samples in /usr/share/doc
> (not /etc/quagga)
>
>---
> quagga.spec |    8 ++------
> 1 files changed, 2 insertions(+), 6 deletions(-)
>
>diff --git a/quagga.spec b/quagga.spec
>index f25809e..614fcc4 100644
>--- a/quagga.spec
>+++ b/quagga.spec
>@@ -185,6 +185,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
> %if %with_rtadv
> 	--enable-rtadv \
> %endif
>+--disable-exampledir \
> --enable-netlink
> 
> make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
>@@ -199,6 +200,7 @@ rm -rf $RPM_BUILD_ROOT
> install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,logrotate.d} \
> 	$RPM_BUILD_ROOT/var/log/quagga $RPM_BUILD_ROOT%{_infodir}
> mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
>+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
> 
> %if %with_pam
> install -d $RPM_BUILD_ROOT/etc/pam.d
>@@ -386,10 +388,6 @@ rm -rf $RPM_BUILD_ROOT
> %dir %attr(755,root,root) /usr/share/info
> %dir %attr(750,root,root) /var/run/quagga
> %endif
>-%if %vty_group
>-# noreplace not used due to smaple conf file
>-%config %attr(644,%quagga_user,%vty_group) %{_sysconfdir}/vtysh.conf.sample
>-%endif
> %{_infodir}/*info*
> %{_mandir}/man*/*
> %{_sbindir}/*
>@@ -398,8 +396,6 @@ rm -rf $RPM_BUILD_ROOT
> %endif
> %dir %{_libdir}
> %{_libdir}/*.so.*
>-# noreplace not used due to smaple conf files
>-%config /etc/quagga/[!v]*
> %if %with_pam
> %config(noreplace) /etc/pam.d/quagga
> %endif
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 817442: 581123 | 581124 | 581125 | 581126 | 581127 | 581128 | 581129 | 581130 | 581131