OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-May-2007 23:06:10
Branch: HEAD Handle: 2007052722060800
Modified files:
openpkg-src/xv xv.patch xv.spec
Log:
upgrading package: xv 3.10a -> 3.10a.20070520
Summary:
Revision Changes Path
1.5 +8 -26 openpkg-src/xv/xv.patch
1.31 +34 -30 openpkg-src/xv/xv.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xv/xv.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 xv.patch
--- openpkg-src/xv/xv.patch 14 Jan 2003 10:10:15 -0000 1.4
+++ openpkg-src/xv/xv.patch 27 May 2007 21:06:08 -0000 1.5
@@ -1,30 +1,12 @@
-diff -Naur xv-3.10a.orig/xv.h xv-3.10a/xv.h
---- xv-3.10a.orig/xv.h Mon Jan 23 21:22:23 1995
-+++ xv-3.10a/xv.h Fri Aug 9 21:05:23 2002
-@@ -115,7 +115,7 @@
+Index: xv.h
+--- xv.h.orig 2007-05-27 22:01:23 +0200
++++ xv.h 2007-05-27 22:02:44 +0200
+@@ -158,7 +158,7 @@
+
#ifndef VMS
# include <errno.h>
- extern int errno; /* SHOULD be in errno.h, but often isn't
*/
-# ifndef __NetBSD__
+# if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__linux__)
- extern char *sys_errlist[]; /* this too... */
- # endif
- #endif
-@@ -159,6 +159,7 @@
- !defined(bsd43) && \
- !defined(aux) && \
- !defined(__bsdi__) && \
-+ !defined(__FreeBSD__) && \
- !defined(sequent)
-
- # if defined(hp300) || defined(hp800) || defined(NeXT)
---- xv-3.10a.orig/vdcomp.c.orig Thu Dec 22 23:34:47 1994
-+++ xv-3.10a/vdcomp.c Tue Jan 14 11:08:01 2003
-@@ -107,6 +107,7 @@
- !defined(__UMAXV__) && \
- !defined(bsd43) && \
- !defined(aux) && \
-+ !defined(__FreeBSD__) && \
- !defined(__bsdi__) && \
- !defined(sequent)
-
+ # if !(defined __GLIBC__ && __GLIBC__ >= 2)
+ extern int errno; /* SHOULD be in errno.h, but often isn't
*/
+ extern char *sys_errlist[]; /* this too... */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xv/xv.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 xv.spec
--- openpkg-src/xv/xv.spec 1 Jan 2007 17:43:09 -0000 1.30
+++ openpkg-src/xv/xv.spec 27 May 2007 21:06:08 -0000 1.31
@@ -22,6 +22,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_base 3.10a
+%define V_patches 20070520
+
# package information
Name: xv
Summary: X Window System Graphics Viewer
@@ -32,53 +36,49 @@
Class: EVAL
Group: XWindow
License: XV
-Version: 3.10a
-Release: 20061016
+Version: %{V_base}.%{V_patches}
+Release: 20070527
# list of sources
-Source0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.tar.gz
-Source1: ftp://ftp.trilon.com/pub/xv/xv-%{version}-png-1.2d.tar.gz
-Patch0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.JPEG-patch
-Patch1: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.TIFF-patch
-Patch2: ftp://ftp.trilon.com/pub/xv/patches/xvpng-1.2d-fix3.patch
-Patch3: xv.patch
+Source0: ftp://ftp.trilon.com/pub/xv/xv-%{V_base}.tar.gz
+Source1:
http://osdn.dl.sourceforge.net/png-mng/xv-%{V_base}-jumbo-patches-%{V_patches}.tar.gz
+Patch0: xv.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, X11, jpeg, png, zlib, tiff, sed
-PreReq: OpenPKG, openpkg >= 20040130, X11, jpeg, png, zlib, tiff, gzip
+BuildPreReq: OpenPKG, openpkg >= 20040130, sed
+PreReq: OpenPKG, openpkg >= 20040130, gzip
+BuildPreReq: X11, jpeg, jasper, png, zlib, tiff
+PreReq: X11, jpeg, jasper, png, zlib, tiff
AutoReq: no
AutoReqProv: no
%description
XV is an interactive image manipulation program for the X Window
System. It can operate on images in the GIF, JPEG, TIFF, PBM, PGM,
- PPM, XPM, X11 bitmap, Sun Rasterfile, Targa, RLE, RGB, BMP, PCX, FITS,
- and PM formats on all known types of X displays. It can generate
- PostScript files, and if you have ghostscript (version 2.6 or above)
- installed on your machine, it can also display them.
-
- This OpenPKG copy of xv is patched for use with version 6 of the
- Independent JPEG Group's JPEG library. It is also patched for use
- with version 3.5.7 of Sam Leffler's TIFF library. It is also patched
- to additionally allow for PNG file viewing.
+ PPM, XPM, X11 bitmap, Sun Rasterfile, Targa, RLE, RGB, BMP, PCX,
+ FITS, and PM formats on all known types of X displays. It can
+ generate PostScript files, and if you have Ghostscript installed, it
+ can also display them.
%track
prog xv = {
version = %{version}
- url = ftp://ftp.cis.upenn.edu/pub/xv/
+ url = ftp://ftp.trilon.com/pub/xv/
+ regex = xv-(\d+\.\d+[a-z]?)\.tar\.gz
+ }
+ prog xv:patchset = {
+ version = %{version}
+ url = ftp://ftp.trilon.com/pub/xv/
regex = xv-(\d+\.\d+[a-z]?)\.tar\.gz
}
%prep
- %setup -q
- %setup -q -T -D -a 1
+ %setup -q -n xv-%{V_base}
+ %setup -q -n xv-%{V_base} -T -D -b 1
+ %{l_patch} -p1 -b <../xv-%{V_base}-jumbo-fix-enh-patch-%{V_patches}.txt
%patch -p0
- %patch -p0 -P 1
- %patch -p0 -P 2
- %patch -p1 -P 3
- %{l_patch} -p1 <xvpng.diff
# use our own gunzip command
%{l_shtool} subst \
@@ -90,13 +90,16 @@
%{l_shtool} subst \
-e 's;\(\tcd $(JPEGDIR)\).*;;' \
-e 's;\(\t( cd $(TIFFDIR) \;\).*;;' \
- -e 's;\(JPEGINC = -I\)$(JPEGDIR);\1%{l_prefix}/include;' \
+ -e 's;\(PREFIX = \).*;\1%{l_prefix};' \
+ -e 's;\(JPEGINC = -I\)$(JPEGDIR)/include;\1%{l_prefix}/include;' \
-e 's;\(JPEGLIB = \)$(JPEGDIR)\(/libjpeg.a\);\1%{l_prefix}/lib\2;' \
- -e 's;\(PNGINC = -I\)$(PNGDIR);\1%{l_prefix}/include;' \
+ -e 's;\(JP2KINC = -I\).*;\1%{l_prefix}/include;' \
+ -e 's;\(JP2KLIB = \).*;\1%{l_prefix}/lib/libjasper.a;' \
+ -e 's;\(PNGINC = -I\)$(PNGDIR)/include;\1%{l_prefix}/include;' \
-e 's;\(PNGLIB = -L\)$(PNGDIR)\(.*\);\1%{l_prefix}/lib\2;' \
- -e 's;\(ZLIBINC = -I\)$(ZLIBDIR);\1%{l_prefix}/include;' \
+ -e 's;\(ZLIBINC = -I\)$(ZLIBDIR)/include;\1%{l_prefix}/include;' \
-e 's;\(ZLIBLIB = -L\)$(ZLIBDIR)\(.*\);\1%{l_prefix}/lib\2;' \
- -e 's;\(TIFFINC = -I\)$(TIFFDIR);\1%{l_prefix}/include/tiff;' \
+ -e 's;\(TIFFINC =
-I\)$(TIFFDIR)/include;\1%{l_prefix}/include/tiff;' \
-e 's;\(TIFFLIB = \)$(TIFFDIR)\(/libtiff.a\);\1%{l_prefix}/lib\2;' \
Makefile
@@ -125,6 +128,7 @@
JPEGLIB=%{l_prefix}/lib/libjpeg.a
%{l_make} %{l_mflags} install \
CCOPTS="$CCOPTS" \
+ PREFIX=$RPM_BUILD_ROOT%{l_prefix} \
BINDIR=$RPM_BUILD_ROOT%{l_prefix}/bin \
LIBDIR=$RPM_BUILD_ROOT%{l_prefix}/share/xv \
MANSUF=1 MANDIR=$RPM_BUILD_ROOT%{l_prefix}/man/man1
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
