Use /etc instead of /usr/etc for mesos and asciidoc as sysconfdir

Change-Id: I440ffe5273f3ff9f601b1054e0011b2743474470
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3715
Tested-by: gerrit-photon <[email protected]>
Reviewed-by: Alexey Makhalov <[email protected]>

SPECS/asciidoc/asciidoc.spec

@@ -1,7 +1,7 @@
 Summary:    AsciiDoc is a human readable text document format
 Name:       asciidoc
 Version:    8.6.9
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:    GPLv2
 URL:        http://asciidoc.org/
 Group:      System Environment/Development
@@ -19,7 +19,7 @@ AsciiDoc is a human readable text document format that can be easily converted t
 
 %build
 export CFLAGS="%{optflags}"
-./configure  --prefix=%{_prefix}
+./configure  --prefix=%{_prefix} --sysconfdir=%{_sysconfdir}
 
 make %{?_smp_mflags}
 
@@ -36,14 +36,16 @@ python tests/testasciidoc.py run
 
 %files
 %defattr(-,root,root)
-/usr/bin/*
-/usr/etc/*
-/usr/share/man/*
+%{_bindir}/*
+%{_sysconfdir}/*
+%{_mandir}/*
 
 %changelog
-*	Tue Apr 25 2017 Priyesh Padmavilasom <[email protected]> 8.6.9-3
--	Fix arch
-*	Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 8.6.9-2
--	GA - Bump release of all rpms
+*   Wed Sep 06 2017 Anish Swaminathan <[email protected]> 8.6.9-4
+-   Use system sysconfdir
+*   Tue Apr 25 2017 Priyesh Padmavilasom <[email protected]> 8.6.9-3
+-   Fix arch
+*   Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 8.6.9-2
+-   GA - Bump release of all rpms
 *   Fri Jun 5 2015 Touseef Liaqat <[email protected]> 8.6.9-1
 -   Initial build.  First version

SPECS/mesos/mesos.spec

@@ -3,7 +3,7 @@
 Summary:        Mesos
 Name:           mesos
 Version:        1.2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        Apache
 URL:            http://mesos.apache.org
 Group:          Applications/System
@@ -23,7 +23,7 @@ BuildRequires:  apr-util-devel >= 1.5.4
 BuildRequires:  subversion >= 1.8.13
 BuildRequires:  subversion-devel >= 1.8.13
 BuildRequires:  cyrus-sasl >= 2.1.26
-BuildRequires:	which
+BuildRequires:  which
 BuildRequires:  python2 >= 2.6
 BuildRequires:  python2-libs
 BuildRequires:  python-xml
@@ -64,7 +64,8 @@ sed -i "/xlocale.h/d" 3rdparty/stout/include/stout/jsonify.hpp
     --disable-silent-rules \
     --prefix=%{_prefix} \
     --bindir=%{_bindir} \
-    --libdir=%{_libdir}
+    --libdir=%{_libdir} \
+    --sysconfdir=%{_sysconfdir}
 make
 
 #%check
@@ -83,7 +84,7 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
 %{_sbindir}/mesos-*
 %{_libdir}/libmesos*
 %{_libexecdir}/mesos/mesos-*
-%{_prefix}/etc/mesos/*
+%{_sysconfdir}/mesos/*
 %{_prefix}/share/mesos/*
 %{_libdir}/libload_qos_controller-*.so
 %{_libdir}/libload_qos_controller.so
@@ -101,10 +102,11 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
 %{_libdir}/libfixed_resource_estimator*
 %{_libdir}/pkgconfig/mesos.pc
 %{python2_sitelib}/*
-%{_prefix}/etc/mesos/*
 %exclude %{_libdir}/debug/
 
 %changelog
+*   Wed Sep 06 2017 Anish Swaminathan <[email protected]> 1.2.0-6
+-   Use system sysconfdir
 *   Tue Aug 15 2017 Alexey Makhalov <[email protected]> 1.2.0-5
 -   Fix compilation issue for glibc-2.26
 *   Thu Aug 10 2017 Xiaolin Li <[email protected]> 1.2.0-4