From c3194e5609decac5d54dd5b044d47886e0a3ae96f9f5dbef415d5f3e8c7ab41e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 17 Oct 2017 12:11:03 +0000 Subject: [PATCH] trim the semicolons at EOL; they are not really needed OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=43 --- glusterfs.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index a3f328f..cc5f4ca 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -159,40 +159,40 @@ make %{?_smp_mflags} %make_install docdir="%_docdir/%name" find %buildroot -type f -name "*.la" -delete -print -mkdir -p "%buildroot%_localstatedir/log"/{glusterd,glusterfs,glusterfsd}; +mkdir -p "%buildroot/%_localstatedir/log"/{glusterd,glusterfs,glusterfsd} # The things seemingly forgotten by make install. # - Manually populate devel dirs -mkdir -p "%buildroot%_includedir/%name"; -install -pm0644 libglusterfs/src/*.h "%buildroot%_includedir/%name/"; +mkdir -p "%buildroot/%_includedir/%name" +install -pm0644 libglusterfs/src/*.h "%buildroot/%_includedir/%name/" # - hekafs wants this: -mkdir -p "%buildroot%_includedir/%name"/{rpc,server}; +mkdir -p "%buildroot/%_includedir/%name"/{rpc,server} install -pm0644 rpc/rpc-lib/src/*.h rpc/xdr/src/*.h \ - "%buildroot%_includedir/%name/rpc/"; + "%buildroot/%_includedir/%name/rpc/" install -pm0644 xlators/protocol/server/src/*.h \ - "%buildroot%_includedir/%name/server/"; + "%buildroot/%_includedir/%name/server/" # - init script; there is no SuSE-release in the build env -mkdir -p "%buildroot%_initddir"; -install -pm0755 extras/init.d/glusterd-SuSE "%buildroot%_initddir/glusterd"; +mkdir -p "%buildroot/%_initddir" +install -pm0755 extras/init.d/glusterd-SuSE "%buildroot/%_initddir/glusterd" # - wrapper umount script? # - logrotate entry -mkdir -p "%buildroot%_localstatedir/log/%name"; +mkdir -p "%buildroot/%_localstatedir/log/%name" # - vim syntax # - state -mkdir -p "%buildroot%_localstatedir/lib/glusterd"; +mkdir -p "%buildroot/%_localstatedir/lib/glusterd" perl -i -pe \ 's{^(\s*option working-directory )\S+}{$1 %_localstatedir/lib/glusterd}g' \ - "%buildroot%_sysconfdir/%name/glusterd.vol"; + "%buildroot/%_sysconfdir/%name/glusterd.vol" # Clean, but must NOT remove .la from dirs not searched by # default, thus maxdepth. find %buildroot -type f -name "*.la" -delete -print # W: wrong-file-end-of-line-encoding -perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el; +perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el -mkdir -p "%buildroot%_unitdir"; +mkdir -p "%buildroot/%_unitdir" rm -Rf "%buildroot%_initddir" ln -s service "%buildroot%_sbindir/rcglusterd" chmod u-s "%buildroot%_bindir/fusermount-glusterfs"