[nut/f16] fix makefile
Michal Hlavinka
mhlavink at fedoraproject.org
Fri Jan 13 09:42:22 UTC 2012
commit 1e76fac88432480fb322db8b3438b010669a2024
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Fri Jan 13 10:41:38 2012 +0100
fix makefile
nut-2.6.3-fixbuild.patch | 12 ++++++++++++
nut.spec | 3 +++
2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/nut-2.6.3-fixbuild.patch b/nut-2.6.3-fixbuild.patch
new file mode 100644
index 0000000..06fac7e
--- /dev/null
+++ b/nut-2.6.3-fixbuild.patch
@@ -0,0 +1,12 @@
+diff -up nut-2.6.3/tools/nut-scanner/Makefile.am.fixbuild nut-2.6.3/tools/nut-scanner/Makefile.am
+--- nut-2.6.3/tools/nut-scanner/Makefile.am.fixbuild 2012-01-13 09:35:04.604373611 +0100
++++ nut-2.6.3/tools/nut-scanner/Makefile.am 2012-01-13 09:35:07.376318534 +0100
+@@ -17,7 +17,7 @@ libnutscan_la_CFLAGS = -I$(top_srcdir)/c
+
+ nut_scanner_SOURCES = nut-scanner.c
+ nut_scanner_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include
+-nut_scanner_LDADD = libnutscan.la
++nut_scanner_LDADD = ../../clients/libupsclient.la libnutscan.la
+
+ if WITH_SSL
+ libnutscan_la_CFLAGS += $(LIBSSL_CFLAGS)
diff --git a/nut.spec b/nut.spec
index 72067a1..0e463f2 100644
--- a/nut.spec
+++ b/nut.spec
@@ -22,6 +22,8 @@ Url: http://www.networkupstools.org/
Source: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.gz
Source3: nut-client.tmpfiles
+Patch1: nut-2.6.3-fixbuild.patch
+
Requires(pre): shadow-utils udev
Requires(post): fileutils chkconfig
Requires(postun): fileutils chkconfig
@@ -108,6 +110,7 @@ necessary to develop NUT client applications.
%prep
%setup -q
+%patch1 -p1 -b .fixbuild
sed -i 's|=NUT-Monitor|=nut-monitor|' scripts/python/app/nut-monitor.desktop
sed -i "s|sys.argv\[0\]|'%{_datadir}/%{name}/nut-monitor/nut-monitor'|" scripts/python/app/NUT-Monitor
sed -i 's|LIBSSL_LDFLAGS|LIBSSL_LIBS|' lib/libupsclient-config.in
More information about the scm-commits
mailing list