[chrpath] Add missing last entry in long options array - Resolves: #868611

Petr Machata pmachata at fedoraproject.org
Thu Apr 4 16:02:21 UTC 2013


commit 7ed0260f88ab74d2222429c1fcbc3a41040f29ab
Author: Petr Machata <pmachata at redhat.com>
Date:   Mon Oct 22 12:15:07 2012 +0200

    Add missing last entry in long options array
    - Resolves: #868611

 chrpath-0.13-getopt_long.patch |   13 +++++++++++++
 chrpath.spec                   |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/chrpath-0.13-getopt_long.patch b/chrpath-0.13-getopt_long.patch
new file mode 100644
index 0000000..2e706f2
--- /dev/null
+++ b/chrpath-0.13-getopt_long.patch
@@ -0,0 +1,13 @@
+diff -up ./main.c~ ./main.c
+--- ./main.c~	2004-09-19 10:33:37.000000000 +0200
++++ ./main.c	2012-10-22 12:10:03.795745769 +0200
+@@ -31,7 +31,8 @@ static struct option long_options[] =
+   {"keepgoing", 0, 0, 'k'},
+   {"list",      0, 0, 'l'},
+   {"replace",   1, 0, 'r'},
+-  {"version",   0, 0, 'v'}
++  {"version",   0, 0, 'v'},
++  {0,           0, 0, 0}
+ };
+ 
+ #else /* not HAVE_GETOPT_LONG */
diff --git a/chrpath.spec b/chrpath.spec
index 222b991..6cba9cc 100644
--- a/chrpath.spec
+++ b/chrpath.spec
@@ -1,11 +1,12 @@
 Summary: Modify rpath of compiled programs
 Name: chrpath
 Version: 0.13
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL+
 Group: Development/Tools
 URL: ftp://ftp.hungry.com/pub/hungry/chrpath/
 Patch0: chrpath-0.13-NULL-entry.patch
+Patch1: chrpath-0.13-getopt_long.patch
 Source0: ftp://ftp.hungry.com/pub/hungry/chrpath/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -17,6 +18,7 @@ is supported.
 %prep
 %setup -q
 %patch0 -p1 -b .NULL
+%patch1 -p1 -b .getopt_long
 
 %build
 %configure
@@ -38,6 +40,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/chrpath.1*
 
 %changelog
+* Mon Oct 22 2012 Petr Machata <pmachata at redhat.com> - 0.13-11
+- Add missing last entry in long options array
+- Resolves: #868611
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list