diff --git a/_servicedata b/_servicedata
index bbe1bc3..99746fb 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">git://github.com/ClusterLabs/pacemaker.git</param>
-    <param name="changesrevision">b49c0d87ced772b60b3c44b810ba1da59f11fa7d</param>
+    <param name="changesrevision">934021cb840f53b0b5de62b45a13baebb2ad6feb</param>
   </service>
 </servicedata>
\ No newline at end of file
diff --git a/bug-728579_pacemaker-stonith-dev-id.patch b/bug-728579_pacemaker-stonith-dev-id.patch
index a941797..cb91fd0 100644
--- a/bug-728579_pacemaker-stonith-dev-id.patch
+++ b/bug-728579_pacemaker-stonith-dev-id.patch
@@ -4,11 +4,11 @@ Date:   Thu Sep 6 15:14:58 2012 +0800
 
     Medium: stonith: Expose IDs of stonith resources to stonith agents through "$CRM_meta_st_device_id" environment variable
 
-Index: pacemaker-2.0.2+20190614.9f18a420a/daemons/fenced/fenced_commands.c
+Index: pacemaker-2.0.2+20191014.81d51216d/daemons/fenced/fenced_commands.c
 ===================================================================
---- pacemaker-2.0.2+20190614.9f18a420a.orig/daemons/fenced/fenced_commands.c
-+++ pacemaker-2.0.2+20190614.9f18a420a/daemons/fenced/fenced_commands.c
-@@ -878,6 +878,7 @@ build_device_from_xml(xmlNode * msg)
+--- pacemaker-2.0.2+20191014.81d51216d.orig/daemons/fenced/fenced_commands.c
++++ pacemaker-2.0.2+20191014.81d51216d/daemons/fenced/fenced_commands.c
+@@ -905,6 +905,7 @@ build_device_from_xml(xmlNode * msg)
                   device->id, device->on_target_actions);
      }
  
@@ -16,11 +16,11 @@ Index: pacemaker-2.0.2+20190614.9f18a420a/daemons/fenced/fenced_commands.c
      device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device);
      /* TODO: Hook up priority */
  
-Index: pacemaker-2.0.2+20190614.9f18a420a/lib/fencing/st_client.c
+Index: pacemaker-2.0.2+20191014.81d51216d/lib/fencing/st_client.c
 ===================================================================
---- pacemaker-2.0.2+20190614.9f18a420a.orig/lib/fencing/st_client.c
-+++ pacemaker-2.0.2+20190614.9f18a420a/lib/fencing/st_client.c
-@@ -40,6 +40,7 @@ struct stonith_action_s {
+--- pacemaker-2.0.2+20191014.81d51216d.orig/lib/fencing/st_client.c
++++ pacemaker-2.0.2+20191014.81d51216d/lib/fencing/st_client.c
+@@ -42,6 +42,7 @@ struct stonith_action_s {
      char *action;
      char *victim;
      GHashTable *args;
@@ -28,7 +28,7 @@ Index: pacemaker-2.0.2+20190614.9f18a420a/lib/fencing/st_client.c
      int timeout;
      int async;
      void *userdata;
-@@ -561,6 +562,7 @@ stonith__destroy_action(stonith_action_t
+@@ -600,6 +601,7 @@ stonith__destroy_action(stonith_action_t
          }
          free(action->output);
          free(action->error);
@@ -36,7 +36,7 @@ Index: pacemaker-2.0.2+20190614.9f18a420a/lib/fencing/st_client.c
          free(action);
      }
  }
-@@ -630,6 +632,8 @@ stonith_action_create(const char *agent,
+@@ -669,6 +671,8 @@ stonith_action_create(const char *agent,
      if (device_args) {
          char buffer[512];
          const char *value = NULL;
@@ -45,7 +45,7 @@ Index: pacemaker-2.0.2+20190614.9f18a420a/lib/fencing/st_client.c
  
          snprintf(buffer, sizeof(buffer), "pcmk_%s_retries", _action);
          value = g_hash_table_lookup(device_args, buffer);
-@@ -637,6 +641,11 @@ stonith_action_create(const char *agent,
+@@ -676,6 +680,11 @@ stonith_action_create(const char *agent,
          if (value) {
              action->max_retries = atoi(value);
          }
@@ -57,9 +57,9 @@ Index: pacemaker-2.0.2+20190614.9f18a420a/lib/fencing/st_client.c
      }
  
      return action;
-@@ -773,6 +782,10 @@ internal_stonith_action_execute(stonith_
-     svc_action->params = action->args;
+@@ -813,6 +822,10 @@ internal_stonith_action_execute(stonith_
      svc_action->cb_data = (void *) action;
+     set_bit(svc_action->flags, SVC_ACTION_NON_BLOCKED);
  
 +    if (action->dev_id) {
 +        svc_action->rsc = strdup(action->dev_id);
@@ -68,10 +68,10 @@ Index: pacemaker-2.0.2+20190614.9f18a420a/lib/fencing/st_client.c
      /* keep retries from executing out of control and free previous results */
      if (is_retry) {
          free(action->output);
-Index: pacemaker-2.0.2+20190614.9f18a420a/lib/services/services_linux.c
+Index: pacemaker-2.0.2+20191014.81d51216d/lib/services/services_linux.c
 ===================================================================
---- pacemaker-2.0.2+20190614.9f18a420a.orig/lib/services/services_linux.c
-+++ pacemaker-2.0.2+20190614.9f18a420a/lib/services/services_linux.c
+--- pacemaker-2.0.2+20191014.81d51216d.orig/lib/services/services_linux.c
++++ pacemaker-2.0.2+20191014.81d51216d/lib/services/services_linux.c
 @@ -30,6 +30,9 @@
  #include "crm/common/mainloop.h"
  #include "crm/services.h"
diff --git a/bug-806256_pacemaker-log-level-notice.patch b/bug-806256_pacemaker-log-level-notice.patch
index e19528d..2936a57 100644
--- a/bug-806256_pacemaker-log-level-notice.patch
+++ b/bug-806256_pacemaker-log-level-notice.patch
@@ -4,11 +4,11 @@ Date:   Thu Mar 14 09:41:53 2013 +0800
 
     Log: Change some messages to notice level (bnc#806256)
 
-Index: pacemaker-1.1.18+20180430.c0d7ba798/daemons/controld/controld_membership.c
+Index: pacemaker-2.0.2+20191023.7a12ccbe4/daemons/controld/controld_membership.c
 ===================================================================
---- pacemaker-1.1.18+20180430.c0d7ba798.orig/daemons/controld/controld_membership.c
-+++ pacemaker-1.1.18+20180430.c0d7ba798/daemons/controld/controld_membership.c
-@@ -414,7 +414,7 @@ crm_update_quorum(gboolean quorum, gbool
+--- pacemaker-2.0.2+20191023.7a12ccbe4.orig/daemons/controld/controld_membership.c
++++ pacemaker-2.0.2+20191023.7a12ccbe4/daemons/controld/controld_membership.c
+@@ -408,7 +408,7 @@ crm_update_quorum(gboolean quorum, gbool
          crm_xml_add(update, XML_ATTR_DC_UUID, fsa_our_uuid);
  
          fsa_cib_update(XML_TAG_CIB, update, call_options, call_id, NULL);
@@ -17,11 +17,11 @@ Index: pacemaker-1.1.18+20180430.c0d7ba798/daemons/controld/controld_membership.
          fsa_register_cib_callback(call_id, FALSE, NULL, cib_quorum_update_complete);
          free_xml(update);
  
-Index: pacemaker-1.1.18+20180430.c0d7ba798/daemons/controld/controld_transition.c
+Index: pacemaker-2.0.2+20191023.7a12ccbe4/daemons/controld/controld_transition.c
 ===================================================================
---- pacemaker-1.1.18+20180430.c0d7ba798.orig/daemons/controld/controld_transition.c
-+++ pacemaker-1.1.18+20180430.c0d7ba798/daemons/controld/controld_transition.c
-@@ -187,7 +187,7 @@ do_te_invoke(long long action,
+--- pacemaker-2.0.2+20191023.7a12ccbe4.orig/daemons/controld/controld_transition.c
++++ pacemaker-2.0.2+20191023.7a12ccbe4/daemons/controld/controld_transition.c
+@@ -186,7 +186,7 @@ do_te_invoke(long long action,
              transition_graph = create_blank_graph();
              return;
          }
@@ -30,16 +30,16 @@ Index: pacemaker-1.1.18+20180430.c0d7ba798/daemons/controld/controld_transition.
                   graph_input);
  
          te_reset_job_counts();
-Index: pacemaker-1.1.18+20180430.c0d7ba798/daemons/fenced/fenced_remote.c
+Index: pacemaker-2.0.2+20191023.7a12ccbe4/daemons/fenced/fenced_remote.c
 ===================================================================
---- pacemaker-1.1.18+20180430.c0d7ba798.orig/daemons/fenced/fenced_remote.c
-+++ pacemaker-1.1.18+20180430.c0d7ba798/daemons/fenced/fenced_remote.c
-@@ -578,7 +578,7 @@ remote_op_timeout(gpointer userdata)
+--- pacemaker-2.0.2+20191023.7a12ccbe4.orig/daemons/fenced/fenced_remote.c
++++ pacemaker-2.0.2+20191023.7a12ccbe4/daemons/fenced/fenced_remote.c
+@@ -595,7 +595,7 @@ remote_op_timeout(gpointer userdata)
          return FALSE;
      }
  
--    crm_debug("Action %s (%s) for %s (%s) timed out",
-+    crm_notice("Action %s (%s) for %s (%s) timed out",
-               op->action, op->id, op->target, op->client_name);
+-    crm_debug("Action '%s' targeting %s for client %s timed out "
++    crm_notice("Action '%s' targeting %s for client %s timed out "
+               CRM_XS " id=%s",
+               op->action, op->target, op->client_name, op->id);
  
-     if (op->phase == st_phase_on) {
diff --git a/pacemaker-2.0.2+20190801.122c32115.tar.xz b/pacemaker-2.0.2+20190801.122c32115.tar.xz
deleted file mode 100644
index 7577077..0000000
--- a/pacemaker-2.0.2+20190801.122c32115.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14863a5786b835484b10243cf8c50a3bf805c6f270848c4bf57e7ec818c97ce1
-size 3479184
diff --git a/pacemaker-2.0.2+20191106.eef56dcd6.tar.xz b/pacemaker-2.0.2+20191106.eef56dcd6.tar.xz
new file mode 100644
index 0000000..0182fe6
--- /dev/null
+++ b/pacemaker-2.0.2+20191106.eef56dcd6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc7877f57929b0abae56acdd4d64d201c5884509a10c782b29665a33f411232f
+size 3518824
diff --git a/pacemaker.changes b/pacemaker.changes
index a6a46b1..1c860be 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,169 @@
+-------------------------------------------------------------------
+Thu Nov 07 10:57:29 UTC 2019 - Yan Gao <ygao@suse.com>
+
+- Update to version 2.0.2+20191106.eef56dcd6:
+- libcrmcommon: Make sure to free the --output-as description.
+- libcrmcommon: Rename formatted output cmdline options.
+- libcrmcommon: Group all output options together.
+
+-------------------------------------------------------------------
+Mon Nov 04 11:08:36 UTC 2019 - Yan Gao <ygao@suse.com>
+
+- Update to version 2.0.2+20191031.1d695899e:
+- scheduler: clarify message about when watchdog will be used
+- scheduler: properly detect whether guest node is fenceable
+- scheduler: initialize unfencing digests to null
+- scheduler: improve graph synapse logging
+
+-------------------------------------------------------------------
+Tue Oct 29 15:18:03 UTC 2019 - Yan Gao <ygao@suse.com>
+
+- Update to version 2.0.2+20191023.7a12ccbe4:
+- tools: Explain TIMESPEC in crm_mon help output.
+- tools: crm_mon --interval should understand more formats.
+- libcrmservice: don't close descriptors above current limit
+- rpm: pacemaker-cts requires pacemaker
+- tools: restore ability to show groups in crm_mon console mode
+- tools: Deprecated old-style output options in crm_mon.
+- cts-scheduler: test "year-2038" only runs for 64bit systems
+- fencer: clarify more messages
+- tools: don't ignore cib_new() errors in crm_mon
+- tools: avoid memory leak in crm_mon when displaying nodes
+- libpe_status: avoid memory leak when outputting resources
+- libcrmcommon: avoid memory leak when IPC compression fails
+- Security: introduce restrictive usage libxslt's security framework
+- libcrmservice: try not to spam close() file descriptors
+- tools: Support "crm_mon --as-html=<filename>".
+- tools: Don't output nodes if they don't have failures.
+- tools: Update checks around crm_mon --daemonize.
+- libpe_status: Use CSS to style messages.
+- tools: Add formatted output messages for resource history.
+- tools: Add output messages for operations history.
+- tools: Add full output to node messages.
+- xml: Add a schema for new crm_mon output.
+- tools: Use formatted output for nodes and their attrs.
+- tools: Enable formatted output in crm_mon.
+- tools: Use formatted output for failed actions.
+- tools: Use formatted output for bans and tickets.
+- tools: Use formatted output for cluster summary.
+- tools: Use formatted output for stonith messages.
+- tools: Add cluster summary messages.
+
+- Rebase:
+  * bug-806256_pacemaker-log-level-notice.patch
+
+-------------------------------------------------------------------
+Wed Oct 16 12:34:13 UTC 2019 - Yan Gao <ygao@suse.com>
+
+- Update to version 2.0.2+20191014.09114c357:
+- fencer: improved log messages regarding fencing actions (bsc#1151007)
+- cts: ComponentFail: killed corosync doesn't respawn immediatelly.
+- fencer: no need to check the length of a non-empty list for pending fencing actions (bsc#1151007)
+- tools: crm_attribute should skip attrd if CIB is file
+- controller: improve throttle mode messages
+- libcrmcommon: improve messages when waiting for child processes
+- scheduler: greatly improve efficiency of interval-origin
+- tools: improve crm_resource --cleanup/--refresh help text
+- fencer: Indicate fencing target in the logs when scheduling and executing fencing command (bsc#1151007)
+- fencer: Make sure concurrent fencing commands get triggered to execute (bsc#1151007)
+- fencer: Don't let a fencing command with a long delay block any other commands pending on the device (bsc#1151007)
+- scheduler: de-duplicate inputs even if not adding to transition graph
+- scheduler: check for invalid orderings when applying orderings
+- scheduler: improve messages when adding actions to transition graph
+- tools: new tool to compare crm_simulate profiling output
+- tools: add crm_simulate option to repeat profiling tests
+- tools: Use glib for cmdline handling in crm_node.
+- fencing: Do not block concurrent fencing actions on a device (bsc#1151007)
+- fencing: handle fence meta-data errors better
+- libcrmcommon: avoid buffer overflows when converting date to string
+- executor: handle remote server socket consistently
+- tools: improve help text for crm_resource --validate
+
+- Rebase:
+  * bug-728579_pacemaker-stonith-dev-id.patch
+
+-------------------------------------------------------------------
+Tue Oct 08 08:40:40 UTC 2019 - Yan Gao <ygao@suse.com>
+
+- Update to version 2.0.2+20190930.7fd98a2c5:
+- controller: allow more cluster properties to take ISO 8601 specification
+- scheduler: allow failure-timeout to take ISO 8601 interval
+- libcrmcommon,tools: handle NULL values better in time handling
+- libcrmcommon: allow 24:00:00 time as equivalent to next day's 00:00:00
+- libcrmcommon: allow ISO 8601 strings of form "<date>T<time> <offset>"
+- libcrmcommon: always mark durations appropriately
+- libcrmcommon: look for magic string "epoch" correctly
+- libcrmcommon: improve ISO 8601 error handling
+- tools: print correct variable in iso8601 error messages
+- tools: improve iso8601 error handling
+- tools: improve stonith_admin error message
+- CIB: improve message when handling op with CIB_file
+- tools: correct iso8601 help for -D/-E
+- libcrmcommon:  Allow spaces in forced output cmdline args.
+- libcrmcommon:  Be more lenient when freeing private data.
+- libpe_status: Don't output empty lists in clone sets.
+- tools: crm_mon --output-as html should default to stdout.
+- tools: Examples in crm_mon should reference new args.
+- Pacemaker Remote: allow environment variable file for PID 1
+- controller: use dynamic cluster recheck interval
+- controller: allow full interval specs for relevant cluster properties
+- scheduler: track "recheck by" for nvpair blocks with date/time rules
+- scheduler: track "recheck by" for location constraints with date/time rules
+- scheduler: add ability to track when date expression evaluation will next change
+- scheduler: improve configuration validation for date expressions
+- libcrmcommon: improve error messages when parsing date strings
+- libpe_status: track "recheck by" for failure timeouts
+- libcrmcommon: Accept a single dash on the command line.
+- libpe_status: improve messages for expired failures
+- libpe_status: check for parameter changes for any unexpired operation
+- libpe_status: match last failures more exactly
+- libpe_status: warn if user specified negative migration-threshold
+- SysInfo: Add support for other units (K, T and P) in SysInfo_megabytes function
+- libcrmcommon: Allow printing blank lines with the info message.
+- libpe_status: Fix segfaults in pe__bundle_*.
+- tools: crm_mon -L does not require an argument.
+- all: avoid Year 2038 issues
+- libcrmcommon: add XML getter for epoch time values
+- libcrmcommon,libcrmcluster: improve usage of timeval with XML
+- libcrmcommon: add XML getter and setter for long long values
+- libcrmcommon: improve error-checking when parsing integers from XML
+- CIB: formally deprecate last-run in operation history XML
+
+-------------------------------------------------------------------
+Tue Oct 08 08:30:40 UTC 2019 - Yan Gao <ygao@suse.com>
+
+- Update to version 2.0.2+20190910.f1b697557:
+- tools: Re-enable verbosity in crm_mon.
+- tools: Don't add extra newlines to curses lists.
+- tools: Fix crm_mon -t.
+- tools: Don't output two asterisks in curses lists.
+- libcrmcommon: Don't output two asterisks in text lists.
+- crm_resource: inherit resource attributes
+
+-------------------------------------------------------------------
+Wed Sep 11 08:24:34 UTC 2019 - Yan Gao <ygao@suse.com>
+
+- Update to version 2.0.2+20190909.d4e0fef91:
+- systemd: use correct name for unit directory variable
+- configure: add --with-runstatedir option
+- crm_mon: Displays completed fault actions as processed.
+- libstonithd: Changing the log level.
+- libcrmcommon: reword output options header
+- logrotate: use correct name for bundle logs
+- Pacemaker Remote: tell systemd not to respawn after fatal failure
+- Pacemaker Remote: correctly detect bind/listen failure
+- Pacemaker Remote: allow user to specify listen address
+- tools: re-enable verbosity in stonith_admin
+- rpm: add soft dependency on tar and bzip2
+- add truly noarch indirection towards pacemaker schemas
+- all: restrict XML children loops to XML elements where appropriate
+- libcrmcommon: handle pcmk_strerror(INT_MIN)
+- tools: avoid memory leak in crm_mon when displaying help
+- pacemakerd: tweak messages for checking for existing instance
+- pacemakerd: log a better warning if unable to create /var/run/crm
+- libcrmcommon:  Support old-style XML output.
+- tools: Add a curses formatter to crm_mon.
+
 -------------------------------------------------------------------
 Thu Aug 08 11:10:39 UTC 2019 - Yan Gao <ygao@suse.com>
 
@@ -50,6 +216,9 @@ Mon Jul 15 09:35:42 UTC 2019 - Yan Gao <ygao@suse.com>
 
 - Update to version 2.0.2+20190712.662793aac:
 - scheduler: wait for probe actions to complete to prevent unnecessary restart/re-promote of dependent resources (bsc#1130122, bsc#1032511)
+- Merge:
+  * bsc#1130122-0001-Fix-scheduler-wait-for-probe-actions-to-complete-to-.patch
+  * bsc#1130122-0002-Test-scheduler-wait-for-probe-actions-to-complete-to.patch
 
 -------------------------------------------------------------------
 Fri Jul 12 13:54:03 UTC 2019 - Yan Gao <ygao@suse.com>
@@ -124,12 +293,28 @@ Fri Jun 07 10:39:45 UTC 2019 - Yan Gao <ygao@suse.com>
 - libpe_status: offer compile-time option to change concurrent-fencing default
 - libstonithd: return proper error code for async stonith action
 - various: improve fencer connection messages
+
 - stonith_admin --help: specify the usage of --cleanup (bsc#1135317)
+- Merge:
+  * bsc#1135317-0001-Low-stonith_admin-help-specify-the-usage-of-cleanup.patch
+
 - pacemaker.service: Add option that does not restart Pacemaker if Corosync stops
+
 - controller: confirm cancel of failed monitors (bsc#1133866)
+- Merge:
+  * bsc#1133866-0001-Fix-controller-confirm-cancel-of-failed-monitors.patch
+
 - libcrmcommon: return error when applying XML diffs containing unknown operations (bsc#1127716)
+- Merge:
+  * bsc#1127716-0003-Fix-libcrmcommon-return-error-when-applying-XML-diff.patch
+
 - libcrmcommon: avoid possible use-of-NULL when applying XML diffs (bsc#1127716)
+- Merge:
+  * bsc#1127716-0002-Fix-libcrmcommon-avoid-possible-use-of-NULL-when-app.patch
+
 - libcrmcommon: correctly apply XML diffs with multiple move/create changes (bsc#1127716)
+- Merge:
+  * bsc#1127716-0001-Fix-libcrmcommon-correctly-apply-XML-diffs-with-mult.patch
 
 -------------------------------------------------------------------
 Fri Jun 07 10:36:55 UTC 2019 - Yan Gao <ygao@suse.com>
@@ -164,13 +349,22 @@ Wed May 01 07:22:56 UTC 2019 - Yan Gao <ygao@suse.com>
 
 - Update to version 2.0.1+20190430.8e851b084:
 - controller: avoid memory leak when duplicate monitor is scheduled
+- Merge:
+  * 0001-Low-controller-avoid-memory-leak-when-duplicate-moni.patch
+
 - libcrmcommon: return proper code if testing pid is denied (bsc#1131353, bsc#1131356)
+- Merge:
+  * bsc#1131353-bsc#1131356-0001-Low-libcrmcommon-return-proper-code-if-testing-pid-i.patch
 
 -------------------------------------------------------------------
 Tue Apr 30 13:17:22 UTC 2019 - Yan Gao <ygao@suse.com>
 
 - Update to version 2.0.1+20190424.a365fc58d:
+
 - libcrmcommon: avoid use-of-NULL when checking whether process is active (bsc#1131353, bsc#1131356)
+- Merge:
+  * bsc#1131353-bsc#1131356-0001-Fix-libcrmcommon-avoid-use-of-NULL-when-checking-whe.patch
+
 - daemons: make start-up log messages consistent across all daemons
 - executor: downgrade disappeared remote client message to notice
 - remote: include channel name in IPC proxy failure message
@@ -704,7 +898,7 @@ Wed May  9 10:48:06 UTC 2018 - ygao@suse.com
 
 - Update to version 1.1.18+20180504.70fe3d6e9:
 - all: take advantage of new libqb features
-- contoller,scheduler: guard hash table deletes
+- contoller,scheduler: guard hash table deletes (bsc#1136712)
 - controller: don't abort after delay if we're no longer DC
 - libcrmcommon,pacemakerd: kernel task name is at most 15 characters
 - cts: install dummy systemd daemon via helper script
diff --git a/pacemaker.spec b/pacemaker.spec
index 1426e6b..ba2b4fc 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -30,6 +30,8 @@
 ## Where to install Pacemaker documentation
 %global pcmk_docdir %{_docdir}/%{name}
 
+%define _rundir /run
+
 ## Path to Python interpreter (leave commented to auto-detect,
 ## or uncomment and edit to use a specific version)
 %global python_path /usr/bin/python%{python3_version}
@@ -74,7 +76,7 @@
 %endif
 
 Name:           pacemaker
-Version:        2.0.2+20190801.122c32115
+Version:        2.0.2+20191106.eef56dcd6
 Release:        0
 Summary:        Scalable High-Availability cluster resource manager
 # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
@@ -192,6 +194,9 @@ Requires:       perl-TimeDate
 Requires:       procps
 Requires:       psmisc
 Requires(post): coreutils
+# For crm_report
+Recommends:     tar
+Recommends:     bzip2
 
 %description cli
 Pacemaker is an advanced, scalable High-Availability cluster resource
@@ -277,7 +282,7 @@ for developing tools for Pacemaker.
 %package       cts
 Summary:        Test framework for cluster-related technologies
 Group:          Productivity/Clustering/HA
-Requires:       libpacemaker3 = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       procps
 Requires:       psmisc
 Requires:       python3
@@ -313,7 +318,7 @@ manager.
 
 %build
 
-export systemdunitdir=%{?_unitdir}%{!?_unitdir:no}
+export systemdsystemunitdir=%{?_unitdir}%{!?_unitdir:no}
 
 %if %{with hardening}
 # prefer distro-provided hardening flags in case they are defined
@@ -350,6 +355,7 @@ autoreconf -fvi
         %{?with_coverage:      --with-coverage}        \
         %{!?with_doc:          --with-brand=}          \
         --with-initdir=%{_initddir}                    \
+        --with-runstatedir=%{_rundir}                  \
         --localstatedir=%{_var}                        \
         --with-version=%{version}-%{release}
 
@@ -549,6 +555,7 @@ fi
 %exclude %{_datadir}/pacemaker/alerts
 %exclude %{_datadir}/pacemaker/tests
 %{_datadir}/pacemaker
+%{_datadir}/pkgconfig/pacemaker-schemas.pc
 %{_datadir}/snmp/mibs/PCMK-MIB.txt
 
 %exclude %{_libexecdir}/ocf/resource.d/pacemaker/controld