Accepting request 479850 from home:ganghe:branches:network:ha-clustering:Factory

OBS-URL: https://build.opensuse.org/request/show/479850
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=97

ocfs2-tools.spec

@@ -27,8 +27,6 @@ Source:         ocfs2-tools-%{version}.tar.gz
 Source1:        o2cb.ocf
 Source2:        reflink.tar.bz2
 Patch001:       auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
-Patch101:       force-debug.patch
-Patch102:       extra-debug.patch
 Patch103:       debug-ocfs2_hb_ctl.patch
 Patch105:       bug-470741-debug_start_failures.patch
 Patch106:       ocfs2-devel.diff
@@ -38,8 +36,6 @@ Patch202:       fix-configure-check-libs.patch
 Patch204:       dont-use-var-lock-subsys.patch
 Patch205:       ocfs2-tools-kernel33.patch
 Patch206:       ocfs2-tools-resource.patch
-Patch212:       bug-805764-ocfs2-controld.patch
-Patch213:       bnc804707-reduce-RR-priority.patch
 Patch225:       0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
 Patch228:       0007-Improve-error-message-if-DLM-service-is-unavailable.patch
 Patch405:       0007-vendor-Add-vendor-files-for-sles12.patch
@@ -140,8 +136,6 @@ OCFS2 filesystem.
 %prep
 %setup -q -a 2
 %patch001 -p1
-%patch101 -p1
-%patch102 -p1
 %patch103 -p1
 %patch105 -p1
 %patch106 -p1
@@ -151,8 +145,6 @@ OCFS2 filesystem.
 %patch204 -p1
 %patch205 -p1
 %patch206 -p1
-%patch212 -p1
-%patch213 -p1
 %patch225 -p1
 %patch228 -p1
 %patch405 -p1
@@ -175,9 +167,9 @@ cd ..
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_prefix}/bin
 mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
-mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
+mkdir -p %{buildroot}%{_udevrulesdir}
 mkdir -p %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2
-cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_sysconfdir}/udev/rules.d
+cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_udevrulesdir}
 cp -f $RPM_SOURCE_DIR/o2cb.ocf %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
 chmod a+x %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
 cp -f vendor/common/o2cb.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
@@ -222,8 +214,8 @@ python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}
 %defattr(-,root,root)
 %doc COPYING CREDITS MAINTAINERS
 %doc documentation/users_guide.txt
-%dir %{_sysconfdir}/udev
-%dir %{_sysconfdir}/udev/rules.d
+%dir /usr/lib/udev
+%dir %{_udevrulesdir}
 /sbin/fsck.ocfs2
 /sbin/mkfs.ocfs2
 /sbin/mounted.ocfs2
@@ -236,7 +228,7 @@ python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}
 %{_sbindir}/o2hbmonitor
 %{_bindir}/reflink
 %{_bindir}/o2info
-%config %{_sysconfdir}/udev/rules.d/51-ocfs2.rules
+%{_udevrulesdir}/51-ocfs2.rules
 %{_mandir}/man8/debugfs.ocfs2.8*
 %{_mandir}/man8/fsck.ocfs2.8*
 %{_mandir}/man8/fsck.ocfs2.checks.8*