[lockdev] Define _GNU_SOURCE in lockdev.c

Jiří Popelka jpopelka at fedoraproject.org
Thu Dec 5 12:13:22 UTC 2013


commit 231faa49858c7a0fd9046ed93bb983d731042c50
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Dec 5 12:00:07 2013 +0100

    Define _GNU_SOURCE in lockdev.c

 lockdev-euidaccess.patch |   19 +++++++++++++++----
 lockdev.spec             |    9 ++++++---
 2 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/lockdev-euidaccess.patch b/lockdev-euidaccess.patch
index 89d7caf..2b7bcc7 100644
--- a/lockdev-euidaccess.patch
+++ b/lockdev-euidaccess.patch
@@ -1,7 +1,18 @@
 diff -up lockdev-scm-2011-10-07/src/lockdev.c.access lockdev-scm-2011-10-07/src/lockdev.c
 --- lockdev-scm-2011-10-07/src/lockdev.c.access	2011-07-22 09:37:10.000000000 +0200
-+++ lockdev-scm-2011-10-07/src/lockdev.c	2013-06-03 12:34:16.870750845 +0200
-@@ -616,7 +616,10 @@ dev_lock (const char *devname)
++++ lockdev-scm-2011-10-07/src/lockdev.c	2013-12-05 11:56:57.836961642 +0100
+@@ -95,6 +95,10 @@
+  *
+  */
+ 
++#ifndef _GNU_SOURCE
++   #define _GNU_SOURCE
++#endif
++
+ #include <errno.h>
+ #include <signal.h>
+ #include <stdio.h>
+@@ -616,7 +620,10 @@ dev_lock (const char *devname)
  	if ( stat( device, &statbuf) == -1 ) {
  		close_n_return(-errno);
  	}
@@ -13,7 +24,7 @@ diff -up lockdev-scm-2011-10-07/src/lockdev.c.access lockdev-scm-2011-10-07/src/
  		close_n_return(-errno);
  	}
  
-@@ -780,7 +783,10 @@ dev_relock (const char  *devname,
+@@ -780,7 +787,10 @@ dev_relock (const char  *devname,
  	if ( stat( device, &statbuf) == -1 ) {
  		close_n_return(-errno);
  	}
@@ -25,7 +36,7 @@ diff -up lockdev-scm-2011-10-07/src/lockdev.c.access lockdev-scm-2011-10-07/src/
  		close_n_return(-errno);
  	}
  
-@@ -870,7 +876,10 @@ dev_unlock (const char *devname,
+@@ -870,7 +880,10 @@ dev_unlock (const char *devname,
  	if ( stat( device, &statbuf) == -1 ) {
  		close_n_return(-errno);
  	}
diff --git a/lockdev.spec b/lockdev.spec
index 70aa34d..347a625 100644
--- a/lockdev.spec
+++ b/lockdev.spec
@@ -10,7 +10,7 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.4
-Release: 0.13.%{checkout}%{?dist}
+Release: 0.14.%{checkout}%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: https://alioth.debian.org/projects/lockdev/
@@ -63,8 +63,8 @@ touch ChangeLog
 # Bootstrap autotools
 autoreconf --verbose --force --install
 
-CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE -D_PATH_LOCK=\\\"%{_lockdir}\\\"" \
-%configure --disable-static --enable-helper
+CFLAGS="%{optflags} -D_PATH_LOCK=\\\"%{_lockdir}\\\"" \
+%configure --disable-static --enable-helper --disable-silent-rules
 
 make %{?_smp_mflags}
 
@@ -104,6 +104,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Thu Dec 05 2013 Jiri Popelka <jpopelka at redhat.com> - 1.0.4-0.14.20111007git
+- Define _GNU_SOURCE in lockdev.c
+
 * Thu Nov 28 2013 Jiri Popelka <jpopelka at redhat.com> - 1.0.4-0.13.20111007git
 - revert previous change and use %%tmpfiles_create in %%post
 


More information about the scm-commits mailing list