File project.diff of Package ocfs2-tools

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package ocfs2-tools (Revision 9b9322b26c9ce4e1a561dd47c699748b)

Currently displaying revision 9b9322b26c9ce4e1a561dd47c699748b , Show latest

--- ocfs2-tools.changes.orig
+++ ocfs2-tools.changes
@@ -2,6 +2,9 @@
 Thu Mar  9 12:36:30 UTC 2017 - ghe@suse.com
 
 - Update ocfs2-tools.tar.gz to upstream v1.8.5 (fate#322956)
+- Unify the source files between openSUSE:Factory and SLE12SP3
+  + 0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
+  - bnc883550-Fix-mkfs.ocfs2-man-page-for-default-slots.patch
 - Drop patches (merged upstream):
   - 0001-libo2dlm-Close-file-description-after-use.patch
   - 0002-debugfs.ocfs2-Fix-a-bug-in-process_open_args.patch
@@ -10,13 +13,6 @@ Thu Mar  9 12:36:30 UTC 2017 - ghe@suse.
   - 0005-do-not-write-sysconfig-if-status-not-changed.patch
   - 0006-o2cb-mount-debugfs-when-load-config.patch
   - 0009-o2cb-fix-systemd-o2cb.service-failure.patch
-- Add patches (from SLE12SP2):
-  + force-debug.patch
-  + extra-debug.patch
-  + bug-805764-ocfs2-controld.patch
-  + bnc804707-reduce-RR-priority.patch
-  + 0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
-  + 0007-Improve-error-message-if-DLM-service-is-unavailable.patch
 
 -------------------------------------------------------------------
 Thu Apr 21 09:57:15 UTC 2016 - zren@suse.com
@@ -87,6 +83,29 @@ Mon Feb  9 03:26:29 UTC 2015 - ghe@suse.
   - use-symlink-in-udev-rules.patch
 
 -------------------------------------------------------------------
+Fri Jun 20 17:54:28 UTC 2014 - rgoldwyn@suse.com
+
+- Fix mkfs.ocfs2 man page to meniton number of slots are
+  dynamically determined based on filesystem size.
+
+-------------------------------------------------------------------
+Fri May 23 17:32:50 UTC 2014 - rgoldwyn@suse.com
+
+- Corrected udev directory from /etc/udev/rules.d
+
+-------------------------------------------------------------------
+Fri May 23 16:44:54 UTC 2014 - rgoldwyn@suse.com
+
+- Improve error message if DLM is not available (bnc#867329)
+  + 0007-Improve-error-message-if-DLM-service-is-unavailable.patch
+
+-------------------------------------------------------------------
+Wed Mar 12 04:31:43 UTC 2014 - rgoldwyn@suse.com
+
+- (bnc#867330) Fix group leave in patch:
+  0002-Remove-controld-dependency-in-group_join-leave.patch
+
+-------------------------------------------------------------------
 Tue Feb 11 16:57:54 UTC 2014 - rgoldwyn@suse.com
 
 - Recommend ocfs2-kmp
--- ocfs2-tools.spec.orig
+++ ocfs2-tools.spec
@@ -27,8 +27,6 @@ Source:         ocfs2-tools-%{version}.t
 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
 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
 %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
 %{_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*

Places

File project.diff of Package ocfs2-tools (Revision 9b9322b26c9ce4e1a561dd47c699748b)

Places