[nwipe] addedd patch to handle search for lib flags separately panel/ncurses

rebus rebus at fedoraproject.org
Sun Feb 10 15:17:40 UTC 2013


commit 0243eb2414b8a4967c45607842e44ba94e39932b
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sun Feb 10 16:17:01 2013 +0100

    addedd patch to handle search for lib flags separately panel/ncurses

 nwipe-0.13-configure.patch |   15 +++++++++++++++
 nwipe.spec                 |   14 +++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/nwipe-0.13-configure.patch b/nwipe-0.13-configure.patch
new file mode 100644
index 0000000..5fdee37
--- /dev/null
+++ b/nwipe-0.13-configure.patch
@@ -0,0 +1,15 @@
+--- nwipe-0.13/configure.ac	2013-02-03 23:08:27.000000000 +0100
++++ nwipe-0.13.new/configure.ac	2013-02-10 15:55:26.258604270 +0100
+@@ -20,7 +20,11 @@
+ 	[
+ 		CFLAGS="${CFLAGS} ${PANEL_CFLAGS}"
+ 		LIBS="${LIBS} ${PANEL_LIBS}"
+-	],
++	])
++
++PKG_CHECK_MODULES(
++	[NCURSES],
++	[ncurses],
+ 	[
+ 		AC_CHECK_LIB([ncurses], [delscreen], [
+ 			LIBS="-lncurses $LIBS"
diff --git a/nwipe.spec b/nwipe.spec
index ddbbb5a..e3064f6 100644
--- a/nwipe.spec
+++ b/nwipe.spec
@@ -1,6 +1,6 @@
 Name:           nwipe
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Securely erase disks using a variety of recognized methods
 
 Group:          Applications/System
@@ -8,6 +8,10 @@ License:        GPLv2
 URL:            http://nwipe.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
+#Detect ncurses modules independently on panel
+#Reported upstream in https://sourceforge.net/tracker/?func=detail&atid=1302269&aid=3604008&group_id=309235
+Patch0:         nwipe-0.13-configure.patch
+
 BuildRequires:  parted-devel
 BuildRequires:  ncurses-devel
 
@@ -28,9 +32,10 @@ a few changes:
 
 %prep
 %setup -q
-
+%patch0 -p 1 -b .configure
 
 %build
+autoreconf
 %configure
 make %{?_smp_mflags}
 
@@ -38,7 +43,7 @@ make %{?_smp_mflags}
 %install
 #Cleanup the buildroot for compatibility with EPEL5
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} LDFLAGS="-lncurses -lpanel"
 
 %clean
 #Cleanup the buildroot for compatibility with EPEL5
@@ -52,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Feb 10 2013 Michal Ambroz <rebus at, seznam.cz> 0.13-2
+- patched build to check for ncurses independently from panel
+
 * Sun Feb 10 2013 Michal Ambroz <rebus at, seznam.cz> 0.13-1
 - upgrade to version 0.13
 


More information about the scm-commits mailing list