[minicom/f18] Disable lock path config when built with lockdev (#754235)

[Jaromír Cápík]

commit 22dfe00f4195f5673bfb529b150a8da13e872c24
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Thu Feb 7 14:34:55 2013 +0100

    Disable lock path config when built with lockdev (#754235)

 minicom-2.5-de-ANSI-fication-removed.patch         |   11 ++++++++
 ...2.5-disable-lock-path-config-with-lockdev.patch |   27 ++++++++++++++++++++
 minicom.spec                                       |    9 ++++++-
 3 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/minicom-2.5-de-ANSI-fication-removed.patch b/minicom-2.5-de-ANSI-fication-removed.patch
new file mode 100644
index 0000000..21d7026
--- /dev/null
+++ b/minicom-2.5-de-ANSI-fication-removed.patch
@@ -0,0 +1,11 @@
+diff -Naur minicom-2.5.old/configure.in minicom-2.5/configure.in
+--- minicom-2.5.old/configure.in	2012-11-21 17:10:32.000000000 +0100
++++ minicom-2.5/configure.in	2012-11-21 17:32:24.146297983 +0100
+@@ -174,7 +174,6 @@
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+-AM_C_PROTOTYPES
+ AC_TYPE_UID_T
+ AC_TYPE_MODE_T
+ AC_TYPE_PID_T
diff --git a/minicom-2.5-disable-lock-path-config-with-lockdev.patch b/minicom-2.5-disable-lock-path-config-with-lockdev.patch
new file mode 100644
index 0000000..858c9a9
--- /dev/null
+++ b/minicom-2.5-disable-lock-path-config-with-lockdev.patch
@@ -0,0 +1,27 @@
+diff -Naur minicom-2.5.orig/src/config.c minicom-2.5/src/config.c
+--- minicom-2.5.orig/src/config.c	2010-12-12 16:02:00.000000000 +0100
++++ minicom-2.5/src/config.c	2013-02-07 14:05:37.968361789 +0100
+@@ -543,7 +543,11 @@
+ 
+   w = mc_wopen(5, 4, 75, 12, BDOUBLE, stdattr, mfcolor, mbcolor, 0, 0, 1);
+   mc_wprintf(w, "%s %.41s\n", serial_device, P_PORT);
++#if !HAVE_LIBLOCKDEV
+   mc_wprintf(w, "%s %.41s\n", lockfile_location, P_LOCK);
++#else
++  mc_wprintf(w, "\n");
++#endif
+   mc_wprintf(w, "%s %.41s\n", callin_program, P_CALLIN);
+   mc_wprintf(w, "%s %.41s\n", callout_program, P_CALLOUT);
+   mc_wprintf(w, "%s %s %s%s%s\n",
+@@ -563,9 +567,11 @@
+       case 'A':
+         pgets(w, mbslen (serial_device) + 1, 0, P_PORT, 64, 64);
+         break;
++#if !HAVE_LIBLOCKDEV
+       case 'B':
+         pgets(w, mbslen (lockfile_location) + 1, 1, P_LOCK, 64, 64);
+         break;
++#endif
+       case 'C':
+         pgets(w, mbslen (callin_program) + 1, 2, P_CALLIN, 64, 64);
+         break;
diff --git a/minicom.spec b/minicom.spec
index c33d3b0..49f747d 100644
--- a/minicom.spec
+++ b/minicom.spec
@@ -1,7 +1,7 @@
 Summary: A text-based modem control and terminal emulation program
 Name: minicom
 Version: 2.5
-Release: 9%{?dist}
+Release: 10%{?dist}
 URL: http://alioth.debian.org/projects/minicom/
 License: GPLv2+
 Group: Applications/Communications
@@ -15,6 +15,8 @@ Patch1: minicom-2.5-rh.patch
 Patch2: minicom-2.5-non-readable-dir.patch
 Patch3: minicom-2.5-man-minicom.patch
 Patch4: minicom-2.5-man-runscript.patch
+Patch5: minicom-2.5-disable-lock-path-config-with-lockdev.patch
+Patch6: minicom-2.5-de-ANSI-fication-removed.patch
 
 %description
 Minicom is a simple text-based modem control and terminal emulation
@@ -28,6 +30,8 @@ language, and other features.
 %patch2 -p1 -b .dir
 %patch3 -p1 -b .man
 %patch4 -p1 -b .man
+%patch5 -p1 -b .lockpath
+%patch6 -p1 -b .de-ansi
 
 cp -pr doc doc_
 rm -f doc_/Makefile*
@@ -54,6 +58,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 %{_mandir}/man1/*
 
 %changelog
+* Thu Feb 07 2013 Jaromir Capik <jcapik at redhat.com> - 2.5-10
+- Disable lock path config when built with lockdev (#754235)
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild