From ab7da35affcfef76694e149177df88e7ca8cb5e0 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Mar 31 2020 17:46:56 +0000 Subject: initial checkin on git.centos.org --- diff --git a/README.md b/README.md new file mode 100644 index 0000000..c3e8aaf --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +This is a dist-git like repo for [gluster-block](https://github.com/gluster/gluster-block). + +The master brach is unused. Use an existing branch instead. +Branch names follow convention like `sig-storage-gluster-common` as descibed on [Naming and Patterns for Mapping Git Branches to Koji Tags](https://wiki.centos.org/BrianStinson/GitBranchesandKojiTags) + +* sig-storage7-gluster-common: CentOS-7 +* ... + +Instructions for building the glusterfs package for the CentOS Storage SIG can be found in the following places: + +* [Comunity Build System](https://wiki.centos.org/HowTos/CommunityBuildSystem) +* [Storage SIG landing page](https://wiki.centos.org/SpecialInterestGroup/Storage/Gluster) + diff --git a/SOURCES/0001-build-add-AM_PROG_CC_C_O-in-configure.ac.patch b/SOURCES/0001-build-add-AM_PROG_CC_C_O-in-configure.ac.patch new file mode 100644 index 0000000..237ed20 --- /dev/null +++ b/SOURCES/0001-build-add-AM_PROG_CC_C_O-in-configure.ac.patch @@ -0,0 +1,35 @@ +From 0e19ee428c4e4d2c16369e44baec25915a399ac3 Mon Sep 17 00:00:00 2001 +From: Niels de Vos +Date: Wed, 20 Dec 2017 14:58:28 +0100 +Subject: [PATCH] build: add AM_PROG_CC_C_O in configure.ac + +--- + Makefile.am | 1 + + configure.ac | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 962da8c..32c0dd0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,5 @@ + ACLOCAL_AMFLAGS = -I m4 ++AUTOMAKE_OPTIONS = subdir-objects + + SUBDIRS = rpc utils cli daemon systemd docs + +diff --git a/configure.ac b/configure.ac +index 3fd3646..101c391 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -62,6 +62,7 @@ LT_INIT + + # Checks for programs. + AC_PROG_CC ++AM_PROG_CC_C_O + + AC_CHECK_PROG(RPCGEN, rpcgen, yes, no) + if test "x$RPCGEN" = "xno"; then +-- +2.14.3 + diff --git a/SPECS/gluster-block.spec b/SPECS/gluster-block.spec new file mode 100644 index 0000000..7d50d11 --- /dev/null +++ b/SPECS/gluster-block.spec @@ -0,0 +1,78 @@ +Summary: Gluster block storage utility +Name: gluster-block +Version: 0.3 +Release: 2%{?dist} +License: GPLv2 or LGPLv3+ +URL: https://github.com/gluster/gluster-block +Source0: https://github.com/gluster/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz + +Patch0001: 0001-build-add-AM_PROG_CC_C_O-in-configure.ac.patch + +BuildRequires: pkgconfig(glusterfs-api) +BuildRequires: pkgconfig(json-c) +BuildRequires: help2man >= 1.36 +%{?systemd_requires} +BuildRequires: systemd +# tarball releases require running ./autogen.sh +BuildRequires: automake, autoconf, libtool, git + +Requires: tcmu-runner-handler-glfs >= 1.0.4 +Requires: targetcli >= 2.1.fb43 +Requires: rpcbind + +%description +gluster-block is a CLI utility, which aims at making gluster backed block +storage creation and maintenance as simple as possible. + +%prep +%setup -q +%patch0001 -p1 -b.AM_PROG_CC_C_O + +%build +echo %{version} > VERSION +./autogen.sh +%configure +%make_build + +%install +%make_install + +%post +%systemd_post gluster-block-target.service +%systemd_post gluster-blockd.service + +%preun +%systemd_preun gluster-block-target.service +%systemd_preun gluster-blockd.service + +%postun +%systemd_postun_with_restart gluster-block-target.service +%systemd_postun_with_restart gluster-blockd.service + +%files +%license COPYING-GPLV2 COPYING-LGPLV3 +%doc README.md +%{_sbindir}/gluster-block +%{_sbindir}/gluster-blockd +%{_mandir}/man8/gluster-block*.8* +%{_unitdir}/gluster-blockd.service +%{_unitdir}/gluster-block-target.service +%config(noreplace) %{_sysconfdir}/sysconfig/gluster-blockd + +%changelog +* Wed Dec 20 2017 Niels de Vos - 0.3-2 +- tcmu-runner has subpackages now, we need tcmu-runner-handler-glfs + +* Mon Nov 06 2017 Prasanna Kumar Kalever - 0.3-1 +- Update to 0.3 + +* Wed Sep 13 2017 Niels de Vos - 0.2.1-2 +- use pkgconfig for BuildRequires +- run setup in quiet mode +- run make_* macros instead of make commands in build/install section +- drop the INSTALL file from the documentation + +* Fri Jun 30 2017 Niels de Vos - 0.2.1-1 +- initial packaging, based on upstream .spec +- prevent ./autogen.sh'd need for git to determine the version +- added systemd macros in the scriptlets