From eaa80a1734b7d1b6d7b41676a1c08fb566c59f3e Mon Sep 17 00:00:00 2001
From: sgrubb <sgrubb@redhat.com>
Date: Thu, 24 Apr 2014 08:48:56 -0400
Subject: [PATCH] New upstream release

---
 .gitignore                  |  1 +
 libcap-ng-0.7.4-badfd.patch | 12 ------------
 libcap-ng.spec              |  9 +++++----
 sources                     |  2 +-
 4 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 libcap-ng-0.7.4-badfd.patch

diff --git a/.gitignore b/.gitignore
index 4cf2194..1a317c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ libcap-ng-0.6.4.tar.gz
 /libcap-ng-0.7.1.tar.gz
 /libcap-ng-0.7.2.tar.gz
 /libcap-ng-0.7.3.tar.gz
+/libcap-ng-0.7.4.tar.gz
diff --git a/libcap-ng-0.7.4-badfd.patch b/libcap-ng-0.7.4-badfd.patch
deleted file mode 100644
index 7161ba5..0000000
--- a/libcap-ng-0.7.4-badfd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp libcap-ng-0.7.3/utils/pscap.c libcap-ng-0.7.4/utils/pscap.c
---- libcap-ng-0.7.3/utils/pscap.c	2012-11-09 14:45:43.000000000 -0500
-+++ libcap-ng-0.7.4/utils/pscap.c	2012-11-30 10:06:42.000000000 -0500
-@@ -142,8 +142,6 @@ int main(int argc, char *argv[])
- 				fclose(f);
- 			}
- 			
--			len = read(fd, buf, sizeof buf - 1);
--			close(fd);
- 			if (header == 0) {
- 				printf("%-5s %-5s %-10s  %-16s  %s\n",
- 				    "ppid", "pid", "name", "command",
diff --git a/libcap-ng.spec b/libcap-ng.spec
index 45a22bf..f928d9a 100644
--- a/libcap-ng.spec
+++ b/libcap-ng.spec
@@ -2,13 +2,12 @@
 
 Summary: An alternate posix capabilities library
 Name: libcap-ng
-Version: 0.7.3
-Release: 6%{?dist}
+Version: 0.7.4
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://people.redhat.com/sgrubb/libcap-ng
 Source0: http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
-Patch1: libcap-ng-0.7.4-badfd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-headers >= 2.6.11 
 
@@ -51,7 +50,6 @@ lets you set the file system based capabilities.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %configure --libdir=/%{_lib}
@@ -113,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Thu Apr 24 2014 Steve Grubb <sgrubb@redhat.com> 0.7.4-1
+- New upstream release
+
 * Thu Nov 14 2013 Steve Grubb <sgrubb@redhat.com> 0.7.3-6
 - Rebuild to pickup current CAP_LAST_CAP
 
diff --git a/sources b/sources
index 2dbd2f7..efcb1d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-610afb774f80a8032b711281df126283  libcap-ng-0.7.3.tar.gz
+55c57c0673b944ea1a755bcb2636dabd  libcap-ng-0.7.4.tar.gz