[gliv] Ver. 1.9.7

[Peter Lemenkov]

commit 8de86d7f6c98198b4cf048874c6bd3b90db3f5b5
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Jan 15 14:32:47 2011 +0300

    Ver. 1.9.7
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore                                         |    1 +
 ...t-with-NULL-returned-from-get_terminal_ou.patch |   46 --------------------
 gliv.spec                                          |   19 ++++++---
 sources                                            |    2 +-
 4 files changed, 15 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8076ac7..edc5145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gliv-1.9.6.tar.bz2
 /gliv-1.9.6.tar.bz2
+/gliv-1.9.7.tar.bz2
diff --git a/gliv.spec b/gliv.spec
index 61de77a..72c36f8 100644
--- a/gliv.spec
+++ b/gliv.spec
@@ -1,27 +1,26 @@
 Summary:	Image viewing utility
 Name:		gliv
-Version:	1.9.6
-Release:	6%{?dist}
+Version:	1.9.7
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://guichaz.free.fr/gliv/
 Source0:	http://guichaz.free.fr/gliv/files/%{name}-%{version}.tar.bz2
 Source1:	gliv.desktop
 Source2:	gliv.applications
-# Patch was sent upstream
-Patch1:		gliv-0001-Fix-segfault-with-NULL-returned-from-get_terminal_ou.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel >= 2.6.0
 BuildRequires:	gtkglext-devel >= 0.7.0
 BuildRequires:	desktop-file-utils
 
+
 %description
 GLiv is an OpenGL image viewer. GLiv is very fast and smooth at rotating,
 panning and zooming if you have an OpenGL accelerated graphics board.
 
+
 %prep
 %setup -q
-%patch1 -p1 -b .segfault
 
 
 %build
@@ -44,15 +43,19 @@ desktop-file-install \
 	--dir %{buildroot}%{_datadir}/applications \
 	%{SOURCE1}
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
 update-desktop-database &> /dev/null ||:
 
+
 %postun
 update-desktop-database &> /dev/null ||:
 
+
 %files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc COPYING NEWS README THANKS
@@ -63,7 +66,12 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/application-registry/gliv.applications
 %{_datadir}/pixmaps/gliv.png
 
+
 %changelog
+* Sat Jan 15 2011 Peter Lemenkov <lemenkov at gmail.com> - 1.9.7-1
+- Ver 1.9.7
+- The only patch was dropped (merged upstream)
+
 * Mon Aug 30 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.9.6-6
 - Fixed segfault (see rhbz #628224).
 - Cleaned up spec-file a little
@@ -74,7 +82,6 @@ update-desktop-database &> /dev/null ||:
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-
 * Sat Feb  9 2008 Peter Lemenkov <lemenkov at gmail.com> - 1.9.6-3
 - Updated version tag.
 - Rebuild for GCC 4.3
diff --git a/sources b/sources
index ea4febf..7e2d827 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e51838ed643f3af5143a20a12f432b9d  gliv-1.9.6.tar.bz2
+5f0fafaf41651da8882e88b3df062d02  gliv-1.9.7.tar.bz2