rpms/xzgv/F-8 xzgv-0.9-fix-doc-install.patch, NONE, 1.1 xzgv-0.9-svn-r35.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 xzgv.spec, 1.3, 1.4 xzgv-0.8-integer-overflow-fix.diff, 1.1, NONE

Sat Jan 5 23:04:24 UTC 2008

Author: terjeros

Update of /cvs/extras/rpms/xzgv/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9590/F-8

Modified Files:
	.cvsignore xzgv.spec 
Added Files:
	xzgv-0.9-fix-doc-install.patch xzgv-0.9-svn-r35.patch 
Removed Files:
	xzgv-0.8-integer-overflow-fix.diff 
Log Message:
Sync with rawhide.



xzgv-0.9-fix-doc-install.patch:

--- NEW FILE xzgv-0.9-fix-doc-install.patch ---
--- xzgv-0.9/doc/Makefile~	2008-01-05 23:25:21.000000000 +0100
+++ xzgv-0.9/doc/Makefile	2008-01-05 23:26:10.000000000 +0100
@@ -37,9 +37,8 @@
 	/bin/sh ../mkinstalldirs $(INFODIR) $(MANDIR)
 
 install: installdirs
-	install xzgv.1 $(MANDIR)
+	install -m 644 xzgv.1 $(MANDIR)
 	install -m 644 xzgv.info.gz $(INFODIR)
-	install-info --infodir=$(INFODIR) xzgv.info.gz
 
 uninstall:
 	$(RM) $(MANDIR)/xzgv.1

xzgv-0.9-svn-r35.patch:

--- NEW FILE xzgv-0.9-svn-r35.patch ---
diff -uNr -x .svn xzgv-0.9/doc/Makefile xzgv-0.9-r39/doc/Makefile
--- xzgv-0.9/doc/Makefile	2007-09-09 20:27:58.000000000 +0200
+++ xzgv-0.9-r39/doc/Makefile	2008-01-05 22:57:00.000000000 +0100
@@ -10,12 +10,12 @@
 
 all: info man
 
-info: xzgv.gz
+info: xzgv.info.gz
 dvi: xzgv.dvi
 
-xzgv.gz: xzgv.texi
-	makeinfo xzgv.texi
-	gzip -f xzgv
+xzgv.info.gz: xzgv.texi
+	makeinfo --no-split xzgv.texi
+	gzip -9f xzgv.info
 
 # `-c' removes the huge number of associated files created by TeX.
 # This saves doing a `make clean' from hell. :-)
@@ -38,16 +38,20 @@
 
 install: installdirs
 	install xzgv.1 $(MANDIR)
-	install xzgv.gz $(INFODIR)
-	install-info  --infodir=$(INFODIR) xzgv.gz
+	install -m 644 xzgv.info.gz $(INFODIR)
+	install-info --infodir=$(INFODIR) xzgv.info.gz
 
 uninstall:
 	$(RM) $(MANDIR)/xzgv.1
 	$(RM) $(INFODIR)/xzgv.gz
-	install-info --remove xzgv
+	install-info --remove xzgv.info.gz
 
 # This *doesn't* remove the Info files, which should stick around to
 # be included in the distribution. Ditto for the man page, since
 # building it requires gawk.
 clean:
 	$(RM) *~ xzgv.dvi
+
+realclean: clean
+	$(RM) xzgv.1 xzgv.info.gz
+
diff -uNr -x .svn xzgv-0.9/doc/xzgv.1 xzgv-0.9-r39/doc/xzgv.1
--- xzgv-0.9/doc/xzgv.1	2007-09-09 20:27:30.000000000 +0200
+++ xzgv-0.9-r39/doc/xzgv.1	1970-01-01 01:00:00.000000000 +0100
@@ -1,2512 +0,0 @@
-.\" *** Auto-generated by makeman, *edits will be lost*! ***
-.\"
-.\"
-.TH XZGV 1 "9th September 2007" "Version 0.9" "Graphics Software"
-.SH NAME
-xzgv \- picture viewer for X, with thumbnail-based file selector
-.\"
-.SH SYNOPSIS
-xzgv [\fIoptions\fR] [\fIdir\fR | \fIfile\fR ...]
-.SH "DESCRIPTION"
-(NB: This man page is automagically generated from xzgv's
-texinfo file, and so may look a bit odd.
-We apologise for the inconvenience. :-))
-.PP
-xzgv is a picture viewer for X, with a thumbnail-based file selector.
-The thumbnails used (thumbnails being small `preview' versions of the
-pictures) are compatible with xv, zgv, and the Gimp. The kinds of
-pictures xzgv allows to be viewed are raster-format pictures (sometimes
-called `bitmaps' and/or `pixmaps'); things like GIF files, JPEG files,
-PNG files, and so on. (Details of file formats supported are given
-elsewhere. See \fBSupported File Formats\fR.)
-.PP
-Most of the time, you will probably want to use xzgv's file selector
-(see \fBThe File Selector\fR) to pick which file(s) to view. This is what
-appears on the left-hand side of the window when you start xzgv as just
-`\fBxzgv\fR' (see \fBOptions\fR). It displays a list of
-subdirectories and picture files in the current directory, along with
-small `thumbnail' versions of the pictures if they exist. (If no
-thumbnails appear in a given directory, or if they are missing for some
-files, you can create/update them by pressing `\fBu\fR'. See \fBUpdating
-Thumbnails\fR.)
-.PP
-When you've picked a file to view, you can view it by clicking on it, or
-pressing `\fBEnter\fR'. This reads the picture and displays
-it in the right-hand part of the window, the viewer (see \fBThe
-Viewer\fR). You can then move around the picture (if it is larger than
-will fit) by dragging it with the mouse, or using the scrollbars, or the
-cursor keys. You can then select another image with the file selector
-(though you need to press `\fBEsc\fR' or `\fBTab\fR' first if using the
-keyboard), or you can quit xzgv by pressing `\fBq\fR'.
-.PP
-While xzgv works much like any other X program, and is certainly
-mouse-friendly :-), it's also designed to be keyboard-friendly.
-Everything in xzgv can be done entirely from the keyboard. Much of this
-keyboard support works like the original zgv (a similar console-based
-picture viewer for Linux).
-.PP
-This overview is, as you might expect, only the very simplest of
-introductions to what xzgv can do, and describes only a very basic use of
-xzgv. xzgv can do a lot more; read on to find out what.
-.PP
-.SH "ACKNOWLEDGEMENTS"
-xzgv was primarily written by Russell Marks, also the author of this
-manual.
-.PP
-Costa Sapuntzakis contributed code for much faster JPEG thumbnail
-generation (to zgv, which I adapted for xzgv).
-.PP
-`\fBinstall-info\fR' is a (very) slightly modified version of the
-original (which is part of the `\fBtexinfo\fR' package). This program is
-used during installation. I think it was mostly written by Karl Berry,
-but it's not terribly clear.
-.PP
-The directory/file icons used were loosely based on gmc's
-\fIdir-close.xpm\fR. I think Tuomas Kuosmanen was responsible for
-that, judging from the change log.
-.PP
-`\fBmkinstalldirs\fR' is straight from the `\fBtexinfo\fR' package, and
-was written by Noah Friedman. (This is also used during installation.)
-.PP
-Huge thanks go to the many people responsible for GTK+, without which
-xzgv would almost certainly not have happened. Thanks also to the
-Rasterman (Carsten Haiztler) for Imlib, without which xzgv would most
-likely have been a complete pain to write. (But no thanks for Electric
-Eyes, which was nearly nice enough for me not to bother with xzgv at
-all! :-))
-.PP
-This program is based in part on the work of the Independent JPEG
-Group. (I don't think I actually need this line any more, but I like
-giving these guys a credit, it's a neat library. :-))
-.PP
-xzgv uses (or rather it does if `\fBINTERP_MMX\fR' was defined when
-compiling, and if it's running on an MMX-capable CPU) MMX instructions
-for interpolation, with the help of libmmx, by Hank Dietz and Randy
-Fisher.
-.PP
-\fIgetopt*.[ch]\fR are from the GNU libc.
-.PP
-``The Graphics Interchange Format(c) is the Copyright property of
-CompuServe Incorporated. GIF(sm) is a Service Mark property of
-CompuServe Incorporated.''
-.PP
-.SH "OPTIONS"
-Normally you'd invoke xzgv as plain `\fBxzgv\fR' (perhaps via a window
-manager menu, or GNOME/KDE menu, etc.). However, you can directly
-specify files to view, or a start directory, on the command-line. In
-addition, there are various options.
-.PP
-(If you're new to xzgv, you should probably skip the rest of this section
-for now and come back to it later.)
-.PP
-The general format of the xzgv command-line goes roughly like this:
-.PP
-xzgv [\fIoptions\fR] [\fIdir\fR | \fIfile\fR ...]
-.br
-.PP
-Two types of options are supported --- the traditional Unix
-single-letter options, and GNU-style long options. Most options can be
-used in either way, and both forms are listed in the table below.
-.PP
-Note that all options are processed after any configuration file(s).
-Config file settings are just like the long-option names below minus the
-`\fB--\fR' (see \fBConfiguring xzgv\fR), though a few command-line options
-are not permitted as config file settings (e.g. `\fBhelp\fR'), and vice
-versa.
-.PP
-Here's what the options do:
-.PP
-`\fB-a\fR'
-.RS
-.RE
-`\fB--auto-hide\fR'
-.RS
-Automatically hide selector when a picture is selected, allowing the
-viewer to use the whole window.
-.PP
-.RE
-`\fB--careful-jpeg\fR'
-.RS
-Enable libjpeg `fancy upsampling'. xzgv defaults to using the faster
-method; as the libjpeg documentation puts it, ``The visual impact of the
-sloppier method is often very small.''
-.PP
-.RE
-`\fB--delete-single-prompt\fR'
-.RS
-(Note that this is normally enabled; use
-`\fB--delete-single-prompt=off\fR' to disable it.) If \fIdisabled\fR,
-xzgv will immediately delete a file when told to, without prompting for
-confirmation. (It's `\fBsingle\fR' because deleting multiple files at
-once will be supported in future, and that will have a separate prompt
-override.)
-.PP
-.RE
-`\fB--dither-hicol\fR'
-.RS
-Use dithering in 15/16-bit, whatever Imlib's default setting is.
-See \fBViewer Options\fR, for a discussion of benefits/drawbacks. You can
-also use `\fB--dither-hicol=off\fR' to disable this if Imlib normally has
-it enabled.
-.PP
[...2645 lines suppressed...]
-
+The format a file is in is identified by its content. The file-reading
+code relies on libgdk to determine the file type and read the file
+correctly; generally this uses the format's `magic number' to determine
+file type --- e.g. a JPEG/JFIF file starts with the (hex) bytes @code{FF
+D8}. So if you start xzgv with @samp{xzgv foo}, and foo is in a
+supported format (such as JPEG), the format will be figured out and the
+file loaded even though the `extension' is absent.
 
 @node  Configuring xzgv, Rationale, File Formats, Top
 @comment  node-name,  next,  previous,  up
@@ -3037,8 +2899,8 @@
 I kludged it :-)).
 
 @item
-When scaling up and imlib is dithering, you end up with a crappy-looking
-picture if you drag the picture around slowly (since each exposed bit is
+When scaling up and dithering, you end up with a crappy-looking picture
+if you drag the picture around slowly (since each exposed bit is
 dithered independently, with no regard given to matching up to any
 previous error-diffusion).
 
@@ -3060,10 +2922,10 @@
 across scrollbar sliders and the paned window splitter handle.
 
 @item
-It doesn't apply any tranparency mask returned by imlib. The practical
-result of this seems to be purple transparent bits in thumbnails and
-scaled-up images, and black transparent bits elsewhere. This doesn't
-affect PNG files, though.
+It doesn't apply any tranparency mask. The practical result of this
+seems to be purple transparent bits in thumbnails and scaled-up images,
+and black transparent bits elsewhere. This doesn't affect PNG files,
+though.
 
 @item
 If a GIF file is corrupted in such a way that the decompressed image
@@ -3089,13 +2951,7 @@
 @itemize @minus
 @item
 Thumbnails are given an accurate width/height `IMGINFO' comment, but are
-always claimed to be "RGB", as Imlib doesn't provide any way to find out
-what type they are.
-
- at item
-xzgv should have an option to treat all files as images, since it
-currently applies a zgv-like file extension filter. This is a bit
-inflexible, given that Imlib supports `all' formats.
+always claimed to be "RGB".
 
 @item
 xzgv @emph{doesn't} duplicate zgv's behaviour of generating thumbnails
@@ -3115,9 +2971,6 @@
 
 @itemize @minus
 @item
-GIF89a extension blocks are ignored.
-
- at item
 Only the first image of a multiple-image GIF is used. (These days,
 multiple-image GIFs are usually animations.)
 @end itemize
@@ -3148,11 +3001,8 @@
 The version of xzgv you are running. @code{xzgv --version} reports this.
 
 @item
-The versions of GTK+ and Imlib you are using. @code{xzgv --version-gtk}
-reports the GTK+ version being used by xzgv, but Imlib is a little more
-tricky --- @code{imlib-config --version} should work if you have a full
-Imlib installation, but failing that, try @code{ls -l
-/usr/lib/libImlib*} or @code{ls -l /usr/X11R6/lib/libImlib*}.
+The versions of GTK+ you are using. @code{xzgv --version-gtk} reports
+the GTK+ version being used by xzgv.
 
 @item
 The bitdepth your X server is running in (common depths are 8-bit (256
@@ -3162,7 +3012,7 @@
 @item
 A description of the bug --- what effects it has, the circumstances it
 occurs in, and so on. Does it only happen for certain types of file?
-Only when in 8-bit modes? Only when dithering is enabled in Imlib? Even
+Only when in 8-bit modes? Only when dithering is enabled? Even
 `irrelevant' details can sometimes be useful.
 
 @item
@@ -3173,7 +3023,7 @@
 @end itemize
 
 So, if you think you've found a bug in xzgv, report it by emailing me at
- at email{rus@@svgalib.org}.
+ at email{rrt@@sc3d.org}.
 
 
 @node  Reporting Documentation Bugs,  , Reporting Bugs, Bugs and Restrictions
diff -uNr -x .svn xzgv-0.9/Makefile xzgv-0.9-r39/Makefile
--- xzgv-0.9/Makefile	2007-09-09 20:12:48.000000000 +0200
+++ xzgv-0.9-r39/Makefile	2008-01-05 22:57:01.000000000 +0100
@@ -42,9 +42,9 @@
 
 # Like in GNU stuff, info files aren't automatically remade,
 # as I don't want to assume everyone has texinfo's `makeinfo' handy.
-info: doc/xzgv.gz
+info: doc/xzgv.info.gz
 
-doc/xzgv.gz: doc/xzgv.texi
+doc/xzgv.info.gz: doc/xzgv.texi
 	cd doc && $(MAKE) info
 
 clean:
@@ -52,6 +52,11 @@
 	cd doc && $(MAKE) clean
 	$(RM) *~
 
+realclean:
+	cd src && $(MAKE) realclean
+	cd doc && $(MAKE) realclean
+	$(RM) *~
+
 install: all
 	cd src && $(MAKE) install
 	cd doc && $(MAKE) install
diff -uNr -x .svn xzgv-0.9/src/help.c xzgv-0.9-r39/src/help.c
--- xzgv-0.9/src/help.c	2007-09-09 02:45:46.000000000 +0200
+++ xzgv-0.9-r39/src/help.c	2008-01-05 22:57:01.000000000 +0100
@@ -46,7 +46,8 @@
 
 label=gtk_label_new("xzgv " XZGV_VER " - picture viewer for X with file selector\n"
                     "Copyright (C) 1999-2005 Russell Marks\n"
-                    "Homepage - http://rus.members.beeb.net/xzgv.html");
+                    "Copyright (C) 2007 Reuben Thomas\n"
+                    "Homepage - http://sourceforge.net/projects/xzgv");
 gtk_box_pack_start(GTK_BOX(vbox),label,TRUE,TRUE,2);
 gtk_widget_show(label);
 
diff -uNr -x .svn xzgv-0.9/src/main.c xzgv-0.9-r39/src/main.c
--- xzgv-0.9/src/main.c	2007-09-09 02:36:21.000000000 +0200
+++ xzgv-0.9-r39/src/main.c	2008-01-05 22:57:01.000000000 +0100
@@ -2589,41 +2589,6 @@
 }
 
 
-int is_picture(char *filename)
-{
-int l=strlen(filename);
-
-if(l<=4) return(0);
-
-/* at time of writing, imlib1 supports PPM/PGM/TIFF/PNG/XPM/JPEG
- * natively, and uses ImageMagick's `convert' for others.
- * But we have our own GIF/PNG/mrf readers.
- */
-if((!strcasecmp(filename+l-4,".gif")) ||
-   (!strcasecmp(filename+l-4,".jpg")) ||
-   (!strcasecmp(filename+l-5,".jpeg")) ||
-   (!strcasecmp(filename+l-4,".png")) ||
-   (!strcasecmp(filename+l-4,".mrf")) ||
-   (!strcasecmp(filename+l-4,".xbm")) ||
-   (!strcasecmp(filename+l-5,".icon")) ||	/* presumably an XBM */
-   (!strcasecmp(filename+l-4,".xpm")) ||
-   (!strcasecmp(filename+l-4,".pbm")) ||
-   (!strcasecmp(filename+l-4,".pgm")) ||
-   (!strcasecmp(filename+l-4,".ppm")) ||
-   (!strcasecmp(filename+l-4,".bmp")) ||
-   (!strcasecmp(filename+l-4,".tga")) ||
-   (!strcasecmp(filename+l-4,".pcx")) ||
-   (!strcasecmp(filename+l-4,".tif")) ||
-   (!strcasecmp(filename+l-5,".tiff")) ||
-   (!strcasecmp(filename+l-4,".prf")) ||
-   (!strcasecmp(filename+l-4,".tim")) ||
-   (!strcasecmp(filename+l-4,".xwd")))
-  return(1);
-else
-  return(0);
-}
-
-
 void idle_xvpic_load(int *entryp)
 {
 static char buf[1024];
@@ -2993,9 +2958,6 @@
     }
   isdir=S_ISDIR(sbuf.st_mode);
   
-  if(!isdir && !is_picture(dent->d_name))
-    continue;
-  
   if(clist_add_new_row(dent->d_name,&sbuf))
     numrows++;
   }
diff -uNr -x .svn xzgv-0.9/src/Makefile xzgv-0.9-r39/src/Makefile
--- xzgv-0.9/src/Makefile	2007-08-14 00:39:16.000000000 +0200
+++ xzgv-0.9-r39/src/Makefile	2008-01-05 22:57:01.000000000 +0100
@@ -39,6 +39,7 @@
 	$(RM) *~ *.o xzgv
 	$(RM) rcfile_opt.h rcfile_var.h rcfile_short.h
 
+realclean: clean
 
 # dependancies
 backend.o: backend.c backend.h


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Jul 2007 16:53:26 -0000	1.2
+++ .cvsignore	5 Jan 2008 23:03:49 -0000	1.3
@@ -1 +1 @@
-xzgv-0.8.tar.gz
+xzgv-0.9.tar.gz


Index: xzgv.spec
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-8/xzgv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xzgv.spec	19 Aug 2007 19:13:34 -0000	1.3
+++ xzgv.spec	5 Jan 2008 23:03:49 -0000	1.4
@@ -1,38 +1,40 @@
-Summary:   A GTK+/Imlib-based picture viewer for X
+Summary:   Picture viewer
 Name:      xzgv
-Version:   0.8
-Release:   6%{?dist}
+Version:   0.9
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/Multimedia
-Source:    ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/%{name}-%{version}.tar.gz
-Patch0:    http://rus.members.beeb.net/xzgv-0.8-integer-overflow-fix.diff
-URL:       http://rus.members.beeb.net/xzgv.html
+Source:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch:     xzgv-0.9-svn-r35.patch
+Patch1:    xzgv-0.9-fix-doc-install.patch
+URL:       http://sourceforge.net/projects/xzgv/
 Requires:  xterm gnome-icon-theme
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk+-devel imlib-devel libpng-devel desktop-file-utils
+BuildRequires: gtk2-devel libpng-devel texinfo desktop-file-utils
 
-%description
-A picture viewer for X, with a thumbnail-based file selector. It uses
-GTK+ and Imlib. Most file formats are supported, and the thumbnails
-used are compatible with xv, zgv, and the Gimp.
+%description 
+A picture viewer with a thumbnail-based file selector.  Many file
+formats are supported, and the thumbnails used are compatible with xv,
+zgv and the Gimp.
 
 %prep
-
 %setup -q
-%patch0 -p1
+%patch -p1
+%patch1 -p1
 
 %build
-sed -i 's|^CFLAGS.*|CFLAGS=%{optflags}|' config.mk
-make %{?_smp_flags}
+%{__sed} -i 's|^CFLAGS.*|CFLAGS=%{optflags}|' config.mk
+%{__make} %{?_smp_flags}
+%{__make} info
+
 %{__cat} <<EOF > %{name}.desktop
 [Desktop Entry]
 Encoding=UTF-8
 Name=xzgv Image Viewer
 Comment=View different types of images
 Exec=xzgv
-Icon=image-viewer.png
 Terminal=false
 Type=Application
 Categories=GTK;Graphics;RasterGraphics;Viewer;
@@ -44,23 +46,19 @@
 %{__install} -d -m 0755 %{buildroot}%{_datadir}/applications/
 %{__install} -m 0644 %{name}.desktop %{buildroot}%{_datadir}/applications
 
-make PREFIX=%{buildroot}/%{_prefix}      \
+%{__make} PREFIX=%{buildroot}/%{_prefix} \
      MANDIR=%{buildroot}/%{_mandir}/man1 \
-     INFODIR=%{buildroot}/%{_infodir}    \
-     INFO_DIR_UPDATE=no install
-
-chmod 0644 AUTHORS COPYING NEWS README TODO ChangeLog 
+     INFODIR=%{buildroot}/%{_infodir} install
 
 desktop-file-install --vendor fedora --delete-original \
   --dir %{buildroot}%{_datadir}/applications           \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-
 %post
 /sbin/install-info %{_infodir}/xzgv.gz %{_infodir}/dir || :
 
 %postun
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
    /sbin/install-info --delete %{_infodir}/xzgv.gz %{_infodir}/dir || :
 fi
 
@@ -72,10 +70,21 @@
 %doc AUTHORS COPYING NEWS README TODO ChangeLog
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}*
-%{_infodir}/*
+%{_infodir}/%{name}*
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Jan  5 2008 Terje Rosten <terjeros at phys.ntnu.no> - 0.9-1
+- 0.9
+- add all patches upto svn r35 
+  fixing install and some other simple stuff
+- new upstream maintainer, src and url updated
+- drop patch now upstream
+- build with gtk2 (yeah!) -> update summary and desc
+- remove icon line from desktop file (icon gone)
+- add texinfo to buildreq
+- add patch to fix install of man and info files
+
 * Sun Aug 19 2007 Terje Rosten <terjeros at phys.ntnu.no> - 0.8-6
 - Fix license tag
 


--- xzgv-0.8-integer-overflow-fix.diff DELETED ---


