rpms/qiv/devel qiv.sh,NONE,1.1 qiv.spec,1.11,1.12

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/qiv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2379/devel

Modified Files:
	qiv.spec 
Added Files:
	qiv.sh 
Log Message:
- fix #213581



--- NEW FILE qiv.sh ---
#!/bin/sh

# https://bugzilla.redhat.com/213581
if [ -z "$XLIB_SKIP_ARGB_VISUALS" ] ; then
    exec env XLIB_SKIP_ARGB_VISUALS=1 /usr/libexec/qiv "$@"
else
    exec /usr/libexec/qiv "$@"
fi


Index: qiv.spec
===================================================================
RCS file: /cvs/extras/rpms/qiv/devel/qiv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qiv.spec	15 Sep 2006 06:49:06 -0000	1.11
+++ qiv.spec	7 Nov 2006 01:55:58 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           qiv
 Version:        2.0
-Release:        6
+Release:        7
 
 Summary:        Quick Image Viewer
 
@@ -8,6 +8,8 @@
 License:        GPL
 URL:            http://www.klografx.net/qiv/
 Source0:        http://www.klografx.net/qiv/download/qiv-2.0-src.tgz
+# fixes #213581 (script 'stolen' from xmms -> thanks ville)
+Source1:        qiv.sh
 Patch0:         %{name}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,9 +30,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 qiv $RPM_BUILD_ROOT%{_bindir}/qiv
+install -Dpm 755 qiv $RPM_BUILD_ROOT%{_libexecdir}/qiv
 install -Dpm 644 qiv.1 $RPM_BUILD_ROOT%{_mandir}/man1/qiv.1
-
+install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/qiv
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,10 +42,14 @@
 %defattr(-,root,root,-)
 %doc README README.CHANGES README.COPYING README.TODO qiv-command.example
 %{_bindir}/qiv
+%{_libexecdir}/qiv
 %{_mandir}/man1/qiv.1*
 
 
 %changelog
+* Tue Nov 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 2.0-7
+- fix #213581
+
 * Fri Sep 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 2.0-6
 - FE6 rebuild