kkeithle pushed to glusterfs (master). "el6 nits, glusterfsd.init and %license"

[notifications at fedoraproject.org]

From be556769cd0ab7e8e01578b1deb0b305b4827075 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle at redhat.com>
Date: Fri, 15 May 2015 14:03:11 -0400
Subject: el6 nits, glusterfsd.init and %license


diff --git a/glusterfs.spec b/glusterfs.spec
index 37e62d2..4cb8652 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -187,8 +187,8 @@ BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %if ( 0%{?rhel} && 0%{?rhel} <= 5 )
 BuildRequires:    python-simplejson
 %endif
-%if ( 0%{?_with_systemd:1} )
 %if ( 0%{_for_fedora_koji_builds} )
+%if ( 0%{?_with_systemd:1} )
 %global glusterfsd_service %{S:%{SOURCE7}}
 %else
 %global glusterfsd_service %{S:%{SOURCE8}}
@@ -929,6 +929,7 @@ fi
 ## All %%files should be placed here and keep them sorted by groups
 ##
 %files
+%{!?_licensedir:%global license %%doc}
 %license COPYING-GPLV2 COPYING-LGPLV3
 %doc ChangeLog INSTALL README.md THANKS
 %if ( 0%{!?_without_syslog:1} )
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/glusterfs.git/commit/?h=master&id=be556769cd0ab7e8e01578b1deb0b305b4827075