Author: somlo Update of /cvs/nonfree/rpms/xv/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv21198 Modified Files: xv.spec Added Files: xv-wait.patch Log Message: fix wait timer (BZ 1929, thanks to Sjoerd Mullender <sjoerd(a)acm.org>) xv-wait.patch: xv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xv-wait.patch --- --- xv-3.10a/xv.h~ 2011-09-07 21:20:05.685991230 +0200 +++ xv-3.10a/xv.h 2011-09-07 21:39:36.990089276 +0200 @@ -389,7 +389,7 @@ # include <limits.h> /* LONG_MAX (really want CLOCK_T_MAX) */ # include <sys/times.h> /* times() */ # ifndef CLK_TCK /* can be undefined in strict-ANSI mode */ -# define CLK_TCK CLOCKS_PER_SEC /* claimed to be same thing in time.h */ +# define CLK_TCK sysconf(_SC_CLK_TCK) # endif #endif Index: xv.spec =================================================================== RCS file: /cvs/nonfree/rpms/xv/F-15/xv.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xv.spec 19 Jul 2010 10:03:10 -0000 1.6 +++ xv.spec 8 Sep 2011 00:48:12 -0000 1.7 @@ -3,7 +3,7 @@ Name: xv Version: %{vprog}.jumbopatch.%{vjumbo} -Release: 11%{?dist} +Release: 12%{?dist} Summary: Interactive image display program for X Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes @@ -27,6 +27,7 @@ Patch1: http://www.gregroelofs.com/code/xv-3.10a-enhancements.20070520-20081216.diff Patch2: xv-3.10a-cleanup.patch Patch3: xv-FLmask.v2.1.patch +Patch4: xv-wait.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtiff-devel libpng-devel jasper-devel desktop-file-utils %if "%{?rhel}" != "4" @@ -134,6 +135,9 @@ # Add FLmask feature (rebased patch; original version won't apply after jumbo patch) %patch3 -p1 +# replace CLK_TCK with sysconf(_SC_CLK_TCK) +%patch4 -p1 + # Include permission to distribute %{__install} -m 0644 -p %{SOURCE2} . @@ -269,6 +273,9 @@ %doc %{_docdir}/%{name}-%{vprog}/manuals/ %changelog +* Wed Sep 07 2011 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-12 +- fix wait timer (BZ 1929, thanks to Sjoerd Mullender <sjoerd(a)acm.org>) + * Mon Jul 19 2010 Paul Howarth <paul(a)city-fan.org&gt; 3.10a.jumbopatch.20070520-11 - drop dependency on man, except for EL-4 build where it's required for ownership of %%{_mandir}/{fi,pl} (later releases include these directories