Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	glusterfs.spec
@@ -1,4 +1,4 @@ - +BuildRequires: -post-build-checks %global _hardened_build 1 %global _for_fedora_koji_builds 1 @@ -77,6 +77,7 @@ 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 @@ -94,10 +95,10 @@ 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_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 @@ -110,10 +111,10 @@ 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_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 @@ -133,6 +134,7 @@ BuildRequires: libaio-devel BuildRequires: python-devel BuildRequires: python-ctypes +BuildRequires: pkgconfig %if ( 0%{!?_without_systemtap:1} ) BuildRequires: systemtap-sdt-devel %endif @@ -313,7 +315,7 @@ %package resource-agents Summary: OCF Resource Agents for GlusterFS License: GPLv3+ -%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 \|\| %{?sles_version} ) ) +%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 \|\| 0%{?sles_version} ) ) # EL5 does not support noarch sub-packages BuildArch: noarch %endif @@ -326,7 +328,11 @@ # for glusterd Requires: glusterfs-server # depending on the distribution, we need pacemaker or resource-agents +%if 0%{?suse_version} +Requires: resource-agents +%else Requires: %{_prefix}/lib/ocf/resource.d +%endif %description resource-agents GlusterFS is a clustered file-system capable of scaling to several @@ -552,6 +558,7 @@ %exclude %{_mandir}/man8/gluster.8* %dir %{_localstatedir}/log/glusterfs %dir %{_localstatedir}/run/gluster +%dir %{_sharedstatedir} %dir %{_sharedstatedir}/glusterd %if ( 0%{!?_without_rdma:1} ) %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma* @@ -576,10 +583,12 @@ /sbin/ldconfig %files libs +%defattr(-,root,root,-) %{_libdir}/.so. %exclude %{_libdir}/libgfapi.* %files cli +%defattr(-,root,root,-) %{_sbindir}/gluster %{_mandir}/man8/gluster.8* @@ -593,15 +602,16 @@ %post geo-replication #restart glusterd. if [ $1 -ge 1 ]; then - %_init_restart glusterd + %_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 +%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 @@ -645,42 +655,43 @@ %{_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 +%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,-,-) %{_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 +%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 @@ -689,6 +700,7 @@ /sbin/ldconfig %files api +%defattr(-,root,root,-) %exclude %{_libdir}/.so %{_libdir}/libgfapi. %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api* @@ -704,6 +716,8 @@
[-] [+]	Added	glusterfs-rpmlintrc ^
@@ -0,0 +1,3 @@ +from Config import * +setBadness('permissions-file-setuid-bit', 0) +addFilter("permissions-file-setuid-bit")
[-] [+]	Changed	glusterfsd.init ^
@@ -9,16 +9,16 @@ # Provides: glusterfsd # Required-Start: $local_fs $network # Required-Stop: $local_fs $network -# Should-Start: -# Should-Stop: -# Default-Start: +# Should-Start: $null +# Should-Stop: $null +# Default-Start: 2 3 5 # Default-Stop: 0 1 2 3 4 5 6 # Short-Description: glusterfs server # Description: Clustered file-system server ### END INIT INFO # Source function library. -. /etc/rc.d/init.d/functions +[ -f /etc/rc.d/init.d/functions] && . /etc/rc.d/init.d/functions exec="/usr/sbin/glusterfsd" prog="glusterfsd"