awjb pushed to qiv (f21). "2.3.1 version upgrade (..more)"

[notifications at fedoraproject.org]

>From 4bf3c872d68feb21afca29647b635377b6419f82 Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date: Wed, 22 Apr 2015 21:35:42 +0200
Subject: 2.3.1 version upgrade

Upgrade to 2.3.1 and clean up spec a little bit.

diff --git a/.gitignore b/.gitignore
index cc40792..9f999fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-qiv-2.2.3.tgz
-/qiv-2.2.4.tgz
+/qiv-2.3.1.tgz
diff --git a/qiv-2.3.1-remove-unused-vars.patch b/qiv-2.3.1-remove-unused-vars.patch
new file mode 100644
index 0000000..b126b05
--- /dev/null
+++ b/qiv-2.3.1-remove-unused-vars.patch
@@ -0,0 +1,19 @@
+diff -up qiv-2.3.1/utils.c.orig qiv-2.3.1/utils.c
+--- qiv-2.3.1/utils.c.orig	2015-04-22 21:16:29.449166120 +0200
++++ qiv-2.3.1/utils.c	2015-04-22 21:16:41.404120295 +0200
+@@ -746,7 +746,6 @@ char *get_icc_profile(char *filename)
+   struct jpeg_error_mgr jerr;
+   int j,i=0;
+   cmsUInt32Number length=0;
+-  int jpg_ok;
+   unsigned char pic_tst[4];
+ 
+   char *icc_ptr=NULL;
+@@ -804,7 +803,6 @@ char *get_icc_profile(char *filename)
+     jpeg_stdio_src(&cinfo, infile); 
+     jpeg_save_markers(&cinfo, 0xE2, 0xFFFF);
+     jpeg_save_markers(&cinfo, JPEG_COM, 0xFFFF);
+-    jpg_ok = jpeg_read_header(&cinfo, 0);
+     fclose(infile);
+     jpeg_prog=cinfo.progressive_mode;
+ 
diff --git a/qiv-optflags.patch b/qiv-optflags.patch
index 4b6d1f0..89666a0 100644
--- a/qiv-optflags.patch
+++ b/qiv-optflags.patch
@@ -1,9 +1,9 @@
---- Makefile.orig	2010-01-10 22:39:08.000000000 +0100
-+++ Makefile	2010-03-29 11:32:12.000000000 +0200
-@@ -47,7 +47,7 @@
+--- qiv-2.3/Makefile.orig	2013-11-30 20:44:47.638915515 +0100
++++ qiv-2.3/Makefile	2013-11-30 20:47:14.615453625 +0100
+@@ -51,7 +51,7 @@
  
  CC        = gcc
- #CFLAGS    = -O -g -Wall
+ #CFLAGS    = -O0 -g -Wall
 -CFLAGS    = -O2 -Wall \
 +CFLAGS    = $(RPM_OPT_FLAGS) -Wall \
  	    -fcaller-saves -ffast-math -fno-strength-reduce \
diff --git a/qiv.spec b/qiv.spec
index 220c9f3..69e1093 100644
--- a/qiv.spec
+++ b/qiv.spec
@@ -1,16 +1,17 @@
 Name:           qiv
-Version:        2.2.4
-Release:        8%{?dist}
+Version:        2.3.1
+Release:        1%{?dist}
 
 Summary:        Quick Image Viewer
 
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://spiegl.de/qiv/
-Source0:        http://spiegl.de/qiv/download/qiv-2.2.4.tgz
+Source0:        http://spiegl.de/qiv/download/%{name}-%{version}.tgz
 Patch0:         %{name}-optflags.patch
 # call exit instead of abort on child error
 Patch1:         %{name}-exit-on-child-error.patch
+Patch2:         %{name}-2.3.1-remove-unused-vars.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, imlib2-devel
@@ -22,8 +23,9 @@ qiv is a very small and pretty fast gdk2/Imlib2 image viewer.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1 -b .optflags
 %patch1 -p1 -b .childexit
+%patch2 -p1 -b .unused
 
 %build
 make %{?_smp_mflags}
@@ -33,7 +35,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 install -Dpm 755 qiv $RPM_BUILD_ROOT%{_bindir}/qiv
 install -Dpm 644 qiv.1 $RPM_BUILD_ROOT%{_mandir}/man1/qiv.1
-chmod 644 qiv-command.example
+chmod 644 contrib/qiv-command.example
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,18 +44,26 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 
-%doc README Changelog README.COPYING README.TODO qiv-command.example
+%doc README Changelog README.COPYING README.TODO contrib/qiv-command.example
 %{_bindir}/qiv
 %{_mandir}/man1/qiv.1*
 
 
 %changelog
+* Wed Apr 22 2015 Andreas Bierfert <andreas.bierfert at lowlatency.de>
+- 2.3.1-1
+- version upgrade
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
+* Sat Nov 30 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 2.3-1
+- version upgrade
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -109,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 2.0-3
 - rebuild on all arches
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Sat Jun 12 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.0-0.fdr.1
diff --git a/sources b/sources
index b58ab2a..f868577 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61785531ae91e8c55562e9c1783f4414  qiv-2.2.4.tgz
+93aea7469be64ebd35277a6dac079fc8  qiv-2.3.1.tgz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qiv.git/commit/?h=f21&id=4bf3c872d68feb21afca29647b635377b6419f82