From 52afa6c0e50bd537ae7d974363b855391cb09146 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos <rdossant@redhat.com>
Date: May 29 2018 11:38:15 +0000
Subject: Use Fedora standard build/linker flags


- Resolves rhbz#1548424

Signed-off-by: Rafael dos Santos <rdossant@redhat.com>

---

diff --git a/build_flags.patch b/build_flags.patch
new file mode 100644
index 0000000..22bb282
--- /dev/null
+++ b/build_flags.patch
@@ -0,0 +1,56 @@
+diff -Nru fence-virt-0.4.0/client/Makefile.in fence-virt-0.4.0/client/Makefile.in
+--- fence-virt-0.4.0/client/Makefile.in	2017-06-05 20:24:36.000000000 +0200
++++ fence-virt-0.4.0/client/Makefile.in	2018-05-29 13:30:48.440122460 +0200
+@@ -40,7 +40,7 @@
+ 	ln -snf $^ $@
+ 
+ fence_virt: ${fence_virt_SOURCES:.c=.o}
+-	$(CC) -o $@ $^ $(LIBS) -L../common -lfence_virt
++	$(CC) -o $@ $^ $(LIBS) -L../common -lfence_virt $(LDFLAGS)
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) -c -o $@ $^ $(INCLUDES)
+diff -Nru fence-virt-0.4.0/server/Makefile.in fence-virt-0.4.0/server/Makefile.in
+--- fence-virt-0.4.0/server/Makefile.in	2017-06-05 20:24:36.000000000 +0200
++++ fence-virt-0.4.0/server/Makefile.in	2018-05-29 13:33:48.983107656 +0200
+@@ -150,31 +150,31 @@
+ all: ${TARGETS} ${MODULES}
+ 
+ fence_virtd: ${fence_virtd_SOURCES:.c=.o} ${fence_virtd_cxx_SOURCES:.cpp=.opp}
+-	$(CXX) -o $@ $^ $(MAIN_LIBS) $(LIBS)
++	$(CXX) -o $@ $^ $(MAIN_LIBS) $(LIBS) $(LDFLAGS)
+ 
+ multicast.so: ${multicast_so_SOURCES:.c=.o}
+-	$(CC) -o $@ $^ $(LIBS) -shared $(NSS_LIBS)
++	$(CC) -o $@ $^ $(CFLAGS) $(LIBS) -shared $(NSS_LIBS) $(LDFLAGS)
+ 
+ libvirt.so: ${libvirt_so_SOURCES:.c=.o}
+-	$(CC) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS)
++	$(CC) -o $@ $^ $(CFLAGS) $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS) $(LDFLAGS)
+ 
+ libvirt-qmf.so: ${libvirt_qmf_so_SOURCES:.c=.o} ${libvirt_qmf_cxx_so_SOURCES:.cpp=.opp}
+-	$(CXX) -o $@ $^ $(LIBS) -shared $(VIRT_QPID)
++	$(CXX) -o $@ $^ $(CFLAGS) $(LIBS) -shared $(VIRT_QPID) $(LDFLAGS)
+ 
+ pm-fence.so: ${pm_fence_so_SOURCES:.c=.o}
+-	$(CC) -o $@ $^ $(LIBS) -shared $(PACEMAKER_LIBS)
++	$(CC) -o $@ $^ $(CFLAGS) $(LIBS) -shared $(PACEMAKER_LIBS) $(LDFLAGS)
+ 
+ cpg.so: ${cpg_so_SOURCES:.c=.o}
+-	$(CC) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS) $(XML_LIBS) $(COROSYNC_LIBS)
++	$(CC) -o $@ $^ $(CFLAGS) $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS) $(XML_LIBS) $(COROSYNC_LIBS) $(LDFLAGS)
+ 
+ null.so: ${null_so_SOURCES:.c=.o}
+-	$(CC) -o $@ $^ $(LIBS) -shared
++	$(CC) -o $@ $^ $(CFLAGS) $(LIBS) -shared $(LDFLAGS)
+ 
+ serial.so: ${serial_so_SOURCES:.c=.o}
+-	$(CC) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS) $(XML_LIBS)
++	$(CC) -o $@ $^ $(CFLAGS) $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS) $(XML_LIBS) $(LDFLAGS)
+ 
+ tcp.so: ${tcp_so_SOURCES:.c=.o}
+-	$(CC) -o $@ $^ $(LIBS) -shared $(NSS_LIBS)
++	$(CC) -o $@ $^ $(CFLAGS) $(LIBS) -shared $(NSS_LIBS) $(LDFLAGS)
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) -c -o $@ $^ $(INCLUDES)
diff --git a/fence-virt.spec b/fence-virt.spec
index 4e11c07..4fd88ca 100644
--- a/fence-virt.spec
+++ b/fence-virt.spec
@@ -1,6 +1,6 @@
 Name:		fence-virt
 Version:	0.4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A pluggable fencing framework for virtual machines
 Group:		System Environment/Base
 License:	GPLv2+
@@ -11,6 +11,7 @@ ExclusiveArch: i686 x86_64
 
 URL:		http://fence-virt.sourceforge.net
 Source0:	http://people.redhat.com/rmccabe/fence-virt/%{name}-%{version}.tar.bz2
+Patch0:		build_flags.patch
 
 
 BuildRequires:	corosynclib-devel libvirt-devel
@@ -93,7 +94,7 @@ are located on corosync cluster nodes.
 
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 ./autogen.sh
@@ -182,6 +183,9 @@ fi
 %{_libdir}/%{name}/cpg.so
 
 %changelog
+* Tue May 29 2018 Rafael dos Santos <rdossant@redhat.com> - 0.4.0-5
+- Use Fedora standard build/linker flags (rhbz#1548424)
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild