mhayden pushed to drbd (f21). "Plenty of patch/spec fixes"

[notifications at fedoraproject.org]

From a617311ba739d5fedf796432698e51e21ea61fbe Mon Sep 17 00:00:00 2001
From: Major Hayden <major at mhtx.net>
Date: Tue, 12 May 2015 08:43:15 -0500
Subject: Plenty of patch/spec fixes


diff --git a/drbd.spec b/drbd.spec
index 69d5d16..d8eb0de 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -1,7 +1,7 @@
 Name: drbd
 Summary: DRBD user-land tools and scripts 
 Version: 8.9.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://oss.linbit.com/%{name}/%{name}-utils-%{version}.tar.gz
 Source1: drbd.service
 Patch0: disable_drbd_checkin.patch
@@ -67,9 +67,8 @@ install -d -m755 $RPM_BUILD_ROOT/%{_unitdir}
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/drbd.service
 rm -f $RPM_BUILD_ROOT/drbd.service
 
-# Relocate udev rules to the location systemd expects to find them
-#install -d -m755 $RPM_BUILD_ROOT/%{_udevrulesdir}
-#mv $RPM_BUILD_ROOT/lib/udev/rules.d/* $RPM_BUILD_ROOT/%{_udevrulesdir}/
+# Remove old heartbeat files that aren't needed any longer in Fedora
+rm -rf $RPM_BUILD_ROOT/etc/ha.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,11 +93,14 @@ This packages includes the DRBD administration tools.
 %{_sbindir}/drbdmeta
 %{_sbindir}/drbd-overview
 
+# systemd-related stuff
 %attr(0644,root,root) %{_unitdir}/drbd.service
+%{_tmpfilesdir}/%{name}.conf
 
 # Yes, these paths are peculiar. Upstream is peculiar.
 # Be forewarned: rpmlint hates this stuff.
 %defattr(755,root,root,-)
+/lib/drbd/drbd
 /lib/drbd/drbdadm-*
 /lib/drbd/drbdsetup-*
 /usr/lib/drbd/*.sh
@@ -145,7 +147,7 @@ DRBD devices in /dev/drbd/by-res and /dev/drbd/by-disk.
 
 %files udev
 %defattr(-,root,root,-)
-%config /lib/udev/65-drbd.rules
+%{_udevrulesdir}/65-drbd.rules
 
 
 
@@ -210,6 +212,9 @@ management utility.
 %systemd_preun sshd.service
 
 %changelog
+* Tue May 12 2015 Major Hayden <major at mhtx.net> - 8.9.2-3
+- Lots of spec/patch fixes
+
 * Tue May 12 2015 Major Hayden <major at mhtx.net> - 8.9.2-2
 - Updated global_common.conf patch
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/drbd.git/commit/?h=f21&id=a617311ba739d5fedf796432698e51e21ea61fbe