kkeithle pushed to nfs-ganesha (el6). "%license"

[notifications at fedoraproject.org]

From 2935b0c30d0fae5c14ace209ba8fcea503fb5c22 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle at redhat.com>
Date: Fri, 22 May 2015 09:53:49 -0400
Subject: %license


diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 45947d1..4045949 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -1,5 +1,5 @@
 
-%global            _hardened_build 1
+%global			_hardened_build 1
 
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
 %global with_nfsidmap 1
@@ -29,7 +29,11 @@
 #%%bcond_without gpfs
 %global use_fsal_gpfs OFF
 
+%if 0%{?fedora} || 0%{?rhel} > 6
 %bcond_without xfs
+%else
+%bcond_with xfs
+%endif
 %global use_fsal_xfs %{on_off_switch xfs}
 
 %bcond_without ceph
@@ -41,7 +45,11 @@
 #%%bcond_with shook
 %global use_fsal_shook OFF
 
+%if 0%{?fedora} || 0%{?rhel} > 6
 %bcond_without gluster
+%else
+%bcond_with gluster
+%endif
 %global use_fsal_gluster %{on_off_switch gluster}
 
 #%%bcond_with hpss
@@ -372,8 +380,8 @@ install -m 644 src/scripts/systemd/nfs-ganesha-lock.service	%{buildroot}%{_unitd
 install -m 644 src/scripts/systemd/sysconfig/nfs-ganesha	%{buildroot}%{_sysconfdir}/sysconfig/ganesha
 %else
 mkdir -p %{buildroot}%{_sysconfdir}/init.d
-install -m 755 scripts/init.d/nfs-ganesha		%{buildroot}%{_sysconfdir}/init.d/nfs-ganesha
-install -m 644 scripts/init.d/sysconfig/ganesha		%{buildroot}%{_sysconfdir}/sysconfig/ganesha
+install -m 755 src/scripts/init.d/nfs-ganesha		%{buildroot}%{_sysconfdir}/init.d/nfs-ganesha
+install -m 644 src/scripts/init.d/sysconfig/ganesha		%{buildroot}%{_sysconfdir}/sysconfig/ganesha
 %endif
 
 %if %{with utils} && 0%{?rhel} && 0%{?rhel} <= 6
@@ -436,6 +444,7 @@ mv %{buildroot}/usr%{_sysconfdir}/ganesha/ganesha.conf %{buildroot}%{_sysconfdir
 %endif
 
 %files
+%{!?_licensedir:%global license %%doc}
 %license src/LICENSE.txt
 %defattr(-,root,root,-)
 %{_bindir}/ganesha.nfsd
@@ -570,7 +579,7 @@ mv %{buildroot}/usr%{_sysconfdir}/ganesha/ganesha.conf %{buildroot}%{_sysconfdir
 
 %changelog
 * Fri May 15 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-2
-- %license
+- %%license
 
 * Tue Apr 21 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-1
 - 2.2.0 GA
@@ -602,7 +611,7 @@ mv %{buildroot}/usr%{_sysconfdir}/ganesha/ganesha.conf %{buildroot}%{_sysconfdir
 - 2.2.0-0.4rc3
 
 * Mon Feb 16 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.3rc2
-- subpackage Requires: nfs-ganesha = %{version}-%{release}
+- subpackage Requires: nfs-ganesha = %%{version}-%%{release}
 
 * Mon Feb 16 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.2rc2
 - 2.2.0-0.2rc2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nfs-ganesha.git/commit/?h=el6&id=2935b0c30d0fae5c14ace209ba8fcea503fb5c22