File glusterfs.spec.rej of Package glusterfs - j0ke.net Open Build Service

File glusterfs.spec.rej of Package glusterfs (Revision 962fc2f1f8867264196793c762e26556)

Currently displaying revision 962fc2f1f8867264196793c762e26556, show latest

***************
*** 1,4 ****
- 
  %global _hardened_build 1
  
  %global _for_fedora_koji_builds 1
--- 1,4 ----
+ BuildRequires:	-post-build-checks
  %global _hardened_build 1
  
  %global _for_fedora_koji_builds 1
***************
*** 89,94 ****
  Source6:          rhel5-load-fuse-modules
  Source11:         glusterfsd.service
  Source13:         glusterfsd.init
  Patch0:           %{name}-3.2.5.configure.ac.patch
  Patch1:           %{name}-3.3.0.libglusterfs.Makefile.patch
  Patch2:           %{name}-3.3.1.rpc.rpcxprt.rdma.name.c.patch
--- 89,95 ----
  Source6:          rhel5-load-fuse-modules
  Source11:         glusterfsd.service
  Source13:         glusterfsd.init
+ Source100:	  glusterfs-rpmlintrc
  Patch0:           %{name}-3.2.5.configure.ac.patch
  Patch1:           %{name}-3.3.0.libglusterfs.Makefile.patch
  Patch2:           %{name}-3.3.1.rpc.rpcxprt.rdma.name.c.patch
***************
*** 106,115 ****
  Requires(post):   systemd-units
  Requires(preun):  systemd-units
  Requires(postun): systemd-units
- %define _init_enable()  /bin/systemctl enable %1.service ;
- %define _init_disable() /bin/systemctl disable %1.service ;
- %define _init_restart() /bin/systemctl try-restart %1.service ;
- %define _init_stop()    /bin/systemctl stop %1.service ;
  %define _init_install() %{__install} -D -p -m 0644 %1 %{buildroot}%{_unitdir}/%2.service ;
  # can't seem to make a generic macro that works
  %define _init_glusterd   %{_unitdir}/glusterd.service
--- 107,116 ----
  Requires(post):   systemd-units
  Requires(preun):  systemd-units
  Requires(postun): systemd-units
+ %define _init_enable()  /bin/systemctl enable %1.service || : ;
+ %define _init_disable() /bin/systemctl disable %1.service || : ;
+ %define _init_restart() /bin/systemctl try-restart %1.service || : ;
+ %define _init_stop()    /bin/systemctl stop %1.service || : ;
  %define _init_install() %{__install} -D -p -m 0644 %1 %{buildroot}%{_unitdir}/%2.service ;
  # can't seem to make a generic macro that works
  %define _init_glusterd   %{_unitdir}/glusterd.service
***************
*** 122,131 ****
  Requires(preun):  /sbin/service
  Requires(preun):  /sbin/chkconfig
  Requires(postun): /sbin/service
- %define _init_enable()  /sbin/chkconfig --add %1 ;
- %define _init_disable() /sbin/chkconfig --del %1 ;
- %define _init_restart() /sbin/service %1 condrestart &>/dev/null ;
- %define _init_stop()    /sbin/service %1 stop &>/dev/null ;
  %define _init_install() %{__install} -D -p -m 0755 %1 %{buildroot}%{_sysconfdir}/init.d/%2 ;
  # can't seem to make a generic macro that works
  %define _init_glusterd   %{_sysconfdir}/init.d/glusterd
--- 123,132 ----
  Requires(preun):  /sbin/service
  Requires(preun):  /sbin/chkconfig
  Requires(postun): /sbin/service
+ %define _init_enable()  /sbin/chkconfig --add %1 || : ;
+ %define _init_disable() /sbin/chkconfig --del %1 || : ;
+ %define _init_restart() /sbin/service %1 condrestart &>/dev/null || : ;
+ %define _init_stop()    /sbin/service %1 stop &>/dev/null || : ;
  %define _init_install() %{__install} -D -p -m 0755 %1 %{buildroot}%{_sysconfdir}/init.d/%2 ;
  # can't seem to make a generic macro that works
  %define _init_glusterd   %{_sysconfdir}/init.d/glusterd
***************
*** 333,339 ****
  %package resource-agents
  Summary:          OCF Resource Agents for GlusterFS
  License:          GPLv3+
- %if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 || %{?sles_version} ) )
  # EL5 does not support noarch sub-packages
  BuildArch:        noarch
  %endif
--- 335,341 ----
  %package resource-agents
  Summary:          OCF Resource Agents for GlusterFS
  License:          GPLv3+
+ %if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 || 0%{?sles_version} ) )
  # EL5 does not support noarch sub-packages
  BuildArch:        noarch
  %endif
***************
*** 748,762 ****
  %post geo-replication
  #restart glusterd.
  if [ $1 -ge 1 ]; then
-     %_init_restart glusterd
  fi
  
  %files geo-replication
  %defattr(-,root,root)
  %{_libexecdir}/glusterfs/gsyncd
  %{_libexecdir}/glusterfs/python/syncdaemon/*
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication
- %ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd.conf
  %endif
  
  %files fuse
--- 757,772 ----
  %post geo-replication
  #restart glusterd.
  if [ $1 -ge 1 ]; then
+     %_init_restart glusterd || :
  fi
  
  %files geo-replication
  %defattr(-,root,root)
  %{_libexecdir}/glusterfs/gsyncd
  %{_libexecdir}/glusterfs/python/syncdaemon/*
+ %dir %{_sharedstatedir}
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/geo-replication
+ %ghost %attr(0644,root,root) %{_sharedstatedir}/glusterd/geo-replication/gsyncd.conf
  %endif
  
  %files fuse
***************
*** 800,841 ****
  %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server*
  %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt*
  %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs*
- %ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info
- %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
  # This is really ugly, but I have no idea how to mark these directories in an
  # other way. They should belong to the glusterfs-server package, but don't
  # exist after installation. They are generated on the first start...
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/post
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/post
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/pre
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/post
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/post
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/pre
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/post
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/pre
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glustershd
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/groups
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs
- %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol
- %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
- %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
  
  %post api
  /sbin/ldconfig
--- 810,852 ----
  %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server*
  %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt*
  %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs*
+ %dir %{_sharedstatedir}
+ %ghost %attr(0644,root,root) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info
+ %ghost %attr(0600,root,root) %{_sharedstatedir}/glusterd/options
  # This is really ugly, but I have no idea how to mark these directories in an
  # other way. They should belong to the glusterfs-server package, but don't
  # exist after installation. They are generated on the first start...
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/stop
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/stop/post
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/stop/pre
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/start
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/start/post
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/start/pre
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/remove-brick
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/post
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/add-brick
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/set
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/set/post
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/set/pre
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/create
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/create/post
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/create/pre
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/delete
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/delete/post
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/hooks/1/delete/pre
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/glustershd
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/vols
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/peers
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/groups
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/nfs
+ %ghost      %attr(0600,root,root) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol
+ %ghost %dir %attr(0755,root,root) %{_sharedstatedir}/glusterd/nfs/run
+ %ghost      %attr(0600,root,root) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
  
  %post api
  /sbin/ldconfig
***************
*** 892,905 ****
  %{_libdir}/*.so
  
  %files api-devel
  %{_libdir}/pkgconfig/glusterfs-api.pc
  %{_libdir}/libgfapi.so
  %{_includedir}/glusterfs/api/*
  
  %post server
  # Legacy server
- %_init_enable glusterd
- %_init_enable glusterfsd
  
  # Genuine Fedora (and EPEL) builds never put gluster files in /etc; if
  # there are any files in /etc from a prior gluster.org install, move them
--- 906,921 ----
  %{_libdir}/*.so
  
  %files api-devel
+ %defattr(-,root,root,-)
  %{_libdir}/pkgconfig/glusterfs-api.pc
  %{_libdir}/libgfapi.so
+ %dir %{_includedir}/glusterfs/api
  %{_includedir}/glusterfs/api/*
  
  %post server
  # Legacy server
+ %_init_enable glusterd || :
+ %_init_enable glusterfsd || :
  
  # Genuine Fedora (and EPEL) builds never put gluster files in /etc; if
  # there are any files in /etc from a prior gluster.org install, move them