[gtkterm] Fix lockfile creation (rhbz#991517)

Hans de Goede jwrdegoede at fedoraproject.org
Wed Sep 4 11:06:45 UTC 2013


commit ca8c3ff6e27a9f6bea963fa7393281e428384ce5
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Sep 4 13:06:34 2013 +0200

    Fix lockfile creation (rhbz#991517)

 ...-should-be-created-under-var-lock-lockdev.patch |   26 ++++++++++++++++++++
 gtkterm.spec                                       |    7 ++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0003-lockfiles-should-be-created-under-var-lock-lockdev.patch b/0003-lockfiles-should-be-created-under-var-lock-lockdev.patch
new file mode 100644
index 0000000..8694354
--- /dev/null
+++ b/0003-lockfiles-should-be-created-under-var-lock-lockdev.patch
@@ -0,0 +1,26 @@
+From c62d7ce8ec7c77dfc3a61a4434da2499ef4e1fc0 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Wed, 4 Sep 2013 13:03:23 +0200
+Subject: [PATCH 3/3] lockfiles should be created under /var/lock/lockdev
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ src/serie.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/serie.h b/src/serie.h
+index 8e1f28a..fcbb207 100644
+--- a/src/serie.h
++++ b/src/serie.h
+@@ -33,7 +33,7 @@ gchar* get_port_string(void);
+ #define BUFFER_EMISSION 4096
+ #define LINE_FEED 0x0A
+ #define POLL_DELAY 100               /* in ms (for control signals) */
+-#define P_LOCK "/var/lock"           /* lock file location */
++#define P_LOCK "/var/lock/lockdev"  /* lock file location */
+ 
+ 
+ #endif
+-- 
+1.8.3.1
+
diff --git a/gtkterm.spec b/gtkterm.spec
index 34af592..ad1def9 100644
--- a/gtkterm.spec
+++ b/gtkterm.spec
@@ -1,6 +1,6 @@
 Name:           gtkterm
 Version:        0.99.7
-Release:        0.3.rc1.git26021e33%{?dist}
+Release:        0.4.rc1.git26021e33%{?dist}
 Summary:        Serial port terminal
 Group:          Applications/Communications
 License:        GPLv2+
@@ -11,6 +11,7 @@ Source1:        gtkterm.desktop
 Source2:        gtkterm.png
 Patch0:         0001-Send_Hexadecimal-handle-more-then-50-chars-and-impro.patch
 Patch1:         0002-Fix-autoreconf-with-newer-autotools.patch
+Patch2:         0003-lockfiles-should-be-created-under-var-lock-lockdev.patch
 BuildRequires:  gtk2-devel gettext-devel bison desktop-file-utils vte-devel
 BuildRequires:  zlib-devel ncurses-devel libtool intltool
 Requires:       hicolor-icon-theme
@@ -24,6 +25,7 @@ Similar to minicom or hyperterminal.
 %setup -q -n gtkterm-26021e331031902291f7f4c88dbb662ece3f6bd3
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 # Because we're using a git snapshot
 autoreconf -i -f
 
@@ -73,6 +75,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Sep 04 2013 Hans de Goede <hdegoede at redhat.com> - 0.99.7-0.4.rc1.git26021e33
+- Fix lockfile creation (rhbz#991517)
+
 * Mon Aug 05 2013 Hans de Goede <hdegoede at redhat.com> - 0.99.7-0.3.rc1.git26021e33
 - Fix FTBFS (rhbz#992450)
 


More information about the scm-commits mailing list