diff options
| author | Niels de Vos <ndevos@redhat.com> | 2012-07-16 18:11:17 +0200 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-07-17 08:22:24 -0700 |
| commit | 3a96dcf9633bc097694a2f7a3acd0b08f830ef5e (patch) | |
| tree | 0f2f3e2fc8963166cefd4860f6fd5ae53aa43c9c | |
| parent | 59ff893d11844eb52453ce4f7f098df05fcde174 (diff) | |
build: Create directories and files that get created during runtime
This should not be needed for files marged as "ghost", but rpm-4.9 is
broken in this respect :-(
Building the packages works again:
$ make dist
$ rpmbuild -ta glusterfs-3git.tar.gz
The now created files and directories are not packaged in the RPM, but
are marked as belonging to the packages. Here a example for
glusterfs-geo-replication:
$ rpm -qlp glusterfs-geo-replication-3git-1.fc17.x86_64.rpm \
| grep /var/lib
/var/lib/glusterd/geo-replication
/var/lib/glusterd/geo-replication/gsyncd.conf
$ rpm2cpio < glusterfs-geo-replication-3git-1.fc17.x86_64.rpm \
| cpio -t --quiet '/var/lib/*'
$
Change-Id: I32019cfbf40e25d9b7ce875fa92b98bae19dabee
BUG: 839668
See-also: https://bugzilla.redhat.com/show_bug.cgi?id=839656
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.com/3674
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
| -rw-r--r-- | glusterfs.spec.in | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index b40d841e6f8..a969af8dacf 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -232,6 +232,23 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha %{__install} -p -m 0644 extras/hook-scripts/*.sh \ %{buildroot}%{_sharedstatedir}/glusterd/hook-scripts/ +# Create directories and files that get created during runtime. This should +# not be needed for files marged as "ghost", but rpm-4.9 is broken in this +# respect :-( +# - see also https://bugzilla.redhat.com/show_bug.cgi?id=839656 +touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info +%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/glustershd +%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/{add-brick,create,delete,set,start,stop,remove,remove-brick}/{pre,post} +%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/nfs +%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/peers +%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/vols +%if 0%{?_can_georeplicate} +%if 0%{!?_without_georeplication:1} +%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/geo-replication +touch %{buildroot}%{_sharedstatedir}/glusterd/geo-replication/gsyncd.conf +%endif +%endif + # Clean up the examples we want to include as %%doc #%{__cp} -a doc/examples examples #%{__rm} -f examples/Makefile* |