From 82e45b87e30ce4ec2ab62c39820951da7a82eddb Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 14 Oct 2015 11:13:50 -0400 Subject: build: install and package header files more conventionally The current way we install and package header files for the -devel package is a hack. This patch uses more conventional autoconf, libtool, and rpmbuild idioms to package -devel headers and libraries. Change-Id: I63ffb3460f5c12b6b355493bd00824ac9e5354c5 BUG: 1271907 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: http://review.gluster.org/12360 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Niels de Vos --- glusterfs.spec.in | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'glusterfs.spec.in') diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 6f7ee953e2d..90705b1ae3c 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -629,20 +629,8 @@ pushd xlators/features/glupy/src python setup.py install --skip-build --verbose --root %{buildroot} popd # Install include directory -mkdir -p %{buildroot}%{_includedir}/glusterfs -install -p -m 0644 libglusterfs/src/*.h \ - %{buildroot}%{_includedir}/glusterfs/ install -p -m 0644 contrib/uuid/*.h \ %{buildroot}%{_includedir}/glusterfs/ -# Following needed by hekafs multi-tenant translator -mkdir -p %{buildroot}%{_includedir}/glusterfs/rpc -install -p -m 0644 rpc/rpc-lib/src/*.h \ - %{buildroot}%{_includedir}/glusterfs/rpc/ -install -p -m 0644 rpc/xdr/src/*.h \ - %{buildroot}%{_includedir}/glusterfs/rpc/ -mkdir -p %{buildroot}%{_includedir}/glusterfs/server -install -p -m 0644 xlators/protocol/server/src/*.h \ - %{buildroot}%{_includedir}/glusterfs/server/ %if ( 0%{_for_fedora_koji_builds} ) install -D -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/sysconfig/glusterd @@ -1027,8 +1015,8 @@ fi %{_sysconfdir}/bash_completion.d/gluster %files devel -%{_includedir}/glusterfs -%exclude %{_includedir}/glusterfs/y.tab.h +%dir %{_includedir}/glusterfs +%{_includedir}/glusterfs/* %exclude %{_includedir}/glusterfs/api %exclude %{_libdir}/libgfapi.so %{_libdir}/*.so -- cgit