From d2f51ca35bd17da595f66449ceceb309fdd74af3 Mon Sep 17 00:00:00 2001
From: Petr Šabata <contyk@redhat.com>
Date: Oct 14 2013 04:59:20 +0000
Subject: 1.1.1 bump


---

diff --git a/.gitignore b/.gitignore
index b84e90c..fce3204 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /sxiv-0.9.tar.gz
 /sxiv-1.0.tar.gz
 /v1.1.tar.gz
+/v1.1.1.tar.gz
diff --git a/sources b/sources
index a74d910..6f74003 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e886bf0223e979f32525dd9335011f3  v1.1.tar.gz
+786f647326bdb24b672519924928dfca  v1.1.1.tar.gz
diff --git a/sxiv-1.1-Fixed-segfault-caused-by-FD_ISSET-on-negative-fd.patch b/sxiv-1.1-Fixed-segfault-caused-by-FD_ISSET-on-negative-fd.patch
deleted file mode 100644
index 68a6065..0000000
--- a/sxiv-1.1-Fixed-segfault-caused-by-FD_ISSET-on-negative-fd.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 98972e98f942fa3d3cd2b8f6a831da0a1f94551f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bert=20M=C3=BCnnich?= <be.muennich@gmail.com>
-Date: Tue, 2 Apr 2013 19:32:59 +0200
-Subject: [PATCH] Fixed segfault caused by FD_ISSET() on negative fd
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reported by Kris Siwiec
-
-Signed-off-by: Petr Šabata <contyk@redhat.com>
----
- Makefile | 2 +-
- main.c   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 747229a..a35e06e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,4 @@
--VERSION = 1.1
-+VERSION = git-20130402
- 
- PREFIX    = /usr/local
- MANPREFIX = $(PREFIX)/share/man
-diff --git a/main.c b/main.c
-index cda0c4d..4962782 100644
---- a/main.c
-+++ b/main.c
-@@ -536,7 +536,7 @@ void run(void)
- 				xfd = MAX(xfd, info.fd);
- 			}
- 			select(xfd + 1, &fds, 0, 0, to_set ? &timeout : NULL);
--			if (FD_ISSET(info.fd, &fds))
-+			if (info.fd != -1 && FD_ISSET(info.fd, &fds))
- 				read_info();
- 		}
- 
--- 
-1.8.1.4
-
diff --git a/sxiv.spec b/sxiv.spec
index 1030035..c9a1422 100644
--- a/sxiv.spec
+++ b/sxiv.spec
@@ -1,14 +1,13 @@
 Name:           sxiv
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        Simple (or small or suckless) X Image Viewer
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            https://github.com/muennich/%{name}/
 Source0:        https://github.com/muennich/%{name}/archive/v%{version}.tar.gz
 Patch0:         %{name}-1.1-optflags.patch
-Patch1:         %{name}-1.1-Fixed-segfault-caused-by-FD_ISSET-on-negative-fd.patch
-Patch2:         %{name}-1.1-image-info.patch
+Patch1:         %{name}-1.1-image-info.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  giflib-devel
 BuildRequires:  imlib2-devel
@@ -25,8 +24,7 @@ customize it for your needs.
 %prep
 %setup -q
 %patch0 -p1 -b .optflags
-%patch1 -p1 -b .segfault
-%patch2 -p1 -b .image-info
+%patch1 -p1 -b .image-info
 
 %build
 export CFLAGS="%{optflags}"
@@ -43,6 +41,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop
 %{_datadir}/applications
 
 %changelog
+* Mon Oct 14 2013 Petr Šabata <contyk@redhat.com> - 1.1.1-1
+- 1.1.1 bump
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild