[CVS] OpenPKG: openpkg-src/xv/ xv.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Feb-2004 11:45:07
Branch: HEAD Handle: 2004020910450600
Modified files:
openpkg-src/xv xv.spec
Log:
try to fix installation procedure
Summary:
RevisionChanges Path
1.23+2 -1 openpkg-src/xv/xv.spec
patch -p0 <<'@@ .'
Index: openpkg-src/xv/xv.spec
$ cvs diff -u -r1.22 -r1.23 xv.spec
--- openpkg-src/xv/xv.spec7 Feb 2004 18:00:43 - 1.22
+++ openpkg-src/xv/xv.spec9 Feb 2004 10:45:06 - 1.23
@@ -34,7 +34,7 @@
Group:XWindow
License: XV
Version: 3.10a
-Release: 20040207
+Release: 20040209
# list of sources
Source0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.tar.gz
@@ -125,6 +125,7 @@
CCOPTS="$CCOPTS -L`%{l_prefix}/etc/rc --query x11_libdir`"
JPEGLIB=%{l_prefix}/lib/libjpeg.a
%{l_make} %{l_mflags} install \
+CCOPTS="$CCOPTS" \
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
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/xv/ xv.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 24-Jan-2004 20:10:34
Branch: HEAD Handle: 2004012419103202
Modified files:
openpkg-src/xv xv.spec
openpkg-web news.txt
Log:
try a workaround to fix building
Summary:
RevisionChanges Path
1.19+5 -1 openpkg-src/xv/xv.spec
1.8200 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/xv/xv.spec
$ cvs diff -u -r1.18 -r1.19 xv.spec
--- openpkg-src/xv/xv.spec23 Jan 2004 13:16:07 - 1.18
+++ openpkg-src/xv/xv.spec24 Jan 2004 19:10:34 - 1.19
@@ -33,7 +33,7 @@
Group:XWindow
License: XV
Version: 3.10a
-Release: 20031202
+Release: 20040124
# list of sources
Source0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.tar.gz
@@ -112,6 +112,10 @@
$RPM_BUILD_ROOT%{l_prefix}/man/man1
# install package
+CCOPTS="-O"
+CCOPTS="$CCOPTS -I`%{l_prefix}/etc/rc --query x11_incdir`"
+CCOPTS="$CCOPTS -L`%{l_prefix}/etc/rc --query x11_libdir`"
+JPEGLIB=%{l_prefix}/lib/libjpeg.a
%{l_make} %{l_mflags} install \
BINDIR=$RPM_BUILD_ROOT%{l_prefix}/bin \
LIBDIR=$RPM_BUILD_ROOT%{l_prefix}/share/xv \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.8199 -r1.8200 news.txt
--- openpkg-web/news.txt 24 Jan 2004 19:07:20 - 1.8199
+++ openpkg-web/news.txt 24 Jan 2004 19:10:32 - 1.8200
@@ -1,3 +1,4 @@
+24-Jan-2004: Upgraded package: P
24-Jan-2004: Upgraded package: P
24-Jan-2004: Upgraded package: P
24-Jan-2004: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/xv/ xv.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 02-Dec-2003 16:58:04
Branch: HEAD Handle: 2003120215580201
Modified files:
openpkg-src/xv xv.spec
openpkg-web news.txt
Log:
add sed dependency, because 'backslash-t' gets otherwise interpreted
as a normal 't'
Summary:
RevisionChanges Path
1.17+2 -2 openpkg-src/xv/xv.spec
1.7646 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/xv/xv.spec
$ cvs diff -u -r1.16 -r1.17 xv.spec
--- openpkg-src/xv/xv.spec8 Jul 2003 14:43:29 - 1.16
+++ openpkg-src/xv/xv.spec2 Dec 2003 15:58:03 - 1.17
@@ -33,7 +33,7 @@
Group:XWindow
License: XV
Version: 3.10a
-Release: 20030707
+Release: 20031202
# list of sources
Source0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.tar.gz
@@ -46,7 +46,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, zlib, tiff
+BuildPreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, zlib, tiff, sed
PreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, zlib, tiff, gzip
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.7645 -r1.7646 news.txt
--- openpkg-web/news.txt 2 Dec 2003 15:56:40 - 1.7645
+++ openpkg-web/news.txt 2 Dec 2003 15:58:02 - 1.7646
@@ -1,3 +1,4 @@
+02-Dec-2003: Upgraded package: P
02-Dec-2003: Upgraded package: P
02-Dec-2003: Upgraded package: P
02-Dec-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/xv/ xv.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 17-Jan-2003 11:04:21
Branch: HEAD Handle: 2003011710042001
Modified files:
openpkg-src/xv xv.spec
openpkg-web news.txt
Log:
finally bless for PLUS
Summary:
RevisionChanges Path
1.13+2 -2 openpkg-src/xv/xv.spec
1.2897 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/xv/xv.spec
$ cvs diff -u -r1.12 -r1.13 xv.spec
--- openpkg-src/xv/xv.spec14 Jan 2003 10:10:15 - 1.12
+++ openpkg-src/xv/xv.spec17 Jan 2003 10:04:21 - 1.13
@@ -29,11 +29,11 @@
URL: http://www.trilon.com/xv/
Vendor: John Bradley
Packager: The OpenPKG Project
-Distribution: OpenPKG [EVAL]
+Distribution: OpenPKG [PLUS]
Group:XWindow
License: XV
Version: 3.10a
-Release: 20030114
+Release: 20030117
# list of sources
Source0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2896 -r1.2897 news.txt
--- openpkg-web/news.txt 17 Jan 2003 08:24:31 - 1.2896
+++ openpkg-web/news.txt 17 Jan 2003 10:04:20 - 1.2897
@@ -1,3 +1,4 @@
+17-Jan-2003: Upgraded package: P
17-Jan-2003: Upgraded package: P
17-Jan-2003: Upgraded package: P
17-Jan-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/xv xv.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Sep-2002 18:06:02
Branch: HEAD Handle: 2002092017060200
Modified files:
openpkg-src/xv xv.spec
Log:
Add native TIFF support, with corresponding patches.
Summary:
RevisionChanges Path
1.5 +14 -8 openpkg-src/xv/xv.spec
Index: openpkg-src/xv/xv.spec
$ cvs diff -u -r1.4 -r1.5 xv.spec
--- openpkg-src/xv/xv.spec20 Sep 2002 15:28:28 - 1.4
+++ openpkg-src/xv/xv.spec20 Sep 2002 16:06:02 - 1.5
@@ -37,16 +37,17 @@
# list of sources
Source0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.tar.gz
-Source1: ftp://ftp.trilon.com/pub/xv/xv-3.10a-png-1.2d.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.trilon.com/pub/xv/patches/xvpng-1.2d-fix3.patch
-Patch2: xv.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
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, patch
-PreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, gzip
+BuildPreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, tiff, patch
+PreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, tiff, gzip
AutoReq: no
AutoReqProv: no
@@ -59,15 +60,17 @@
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, and to feature additional
-PNG file viewing.
+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.
%prep
%setup0 -q
%setup1 -q -T -D -a 1
%patch0 -p0
%patch1 -p0
-%patch2 -p1
+%patch2 -p0
+%patch3 -p1
patch -p1 < xvpng.diff
# use our own gunzip command
@@ -77,12 +80,15 @@
# use our own JPEG, PNG, and z libraries
%{l_shtool} subst -e 's;\(\tcd $(JPEGDIR)\).*;;' \
+ -e 's;\(\t( cd $(TIFFDIR) \;\).*;;' \
-e 's;\(JPEGINC = -I\)$(JPEGDIR);\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;\(PNGLIB = -L\)$(PNGDIR)\(.*\);\1%{l_prefix}/lib\2;' \
-e 's;\(ZLIBINC = -I\)$(ZLIBDIR);\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;\(TIFFLIB =
\)$(TIFFDIR)\(/libtiff.a\);\1%{l_prefix}/lib\2;' \
Makefile
%build
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/xv xv.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 20-Sep-2002 17:28:28
Branch: HEAD Handle: 2002092016282701
Modified files:
openpkg-src/xv xv.spec
openpkg-web news.txt
Log:
Fixed native library logic, and added PNG support.
Summary:
RevisionChanges Path
1.4 +28 -11 openpkg-src/xv/xv.spec
1.1590 +1 -0 openpkg-web/news.txt
Index: openpkg-src/xv/xv.spec
$ cvs diff -u -r1.3 -r1.4 xv.spec
--- openpkg-src/xv/xv.spec13 Aug 2002 12:50:31 - 1.3
+++ openpkg-src/xv/xv.spec20 Sep 2002 15:28:28 - 1.4
@@ -33,18 +33,20 @@
Group:XWindow
License: XV
Version: 3.10a
-Release: 20020812
+Release: 20020920
# list of sources
Source0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.tar.gz
+Source1: ftp://ftp.trilon.com/pub/xv/xv-3.10a-png-1.2d.tar.gz
Patch0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.JPEG-patch
-Patch1: xv.patch
+Patch1: ftp://ftp.trilon.com/pub/xv/patches/xvpng-1.2d-fix3.patch
+Patch2: xv.patch
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, X11, jpeg
-PreReq: OpenPKG, openpkg >= 20020206, X11, gzip, jpeg
+BuildPreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, patch
+PreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, gzip
AutoReq: no
AutoReqProv: no
@@ -57,14 +59,31 @@
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.
+Independent JPEG Group's JPEG library, and to feature additional
+PNG file viewing.
%prep
%setup0 -q
+%setup1 -q -T -D -a 1
%patch0 -p0
-%patch1 -p1
+%patch1 -p0
+%patch2 -p1
+patch -p1 < xvpng.diff
+
+# use our own gunzip command
%{l_shtool} subst -e 's;#undef USE_GUNZIP;#define USE_GUNZIP;' \
- -e 's;#define GUNZIP "/usr/local/bin/gunzip -q";#define
GUNZIP "%{l_prefix}/bin/gunzip -q";' config.h
+ -e 's;#define GUNZIP "/usr/local/bin/gunzip -q";#define
GUNZIP "%{l_prefix}/bin/gunzip -q";' \
+ config.h
+
+# use our own JPEG, PNG, and z libraries
+%{l_shtool} subst -e 's;\(\tcd $(JPEGDIR)\).*;;' \
+ -e 's;\(JPEGINC = -I\)$(JPEGDIR);\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;\(PNGLIB = -L\)$(PNGDIR)\(.*\);\1%{l_prefix}/lib\2;' \
+ -e 's;\(ZLIBINC = -I\)$(ZLIBDIR);\1%{l_prefix}/include;' \
+ -e 's;\(ZLIBLIB = -L\)$(ZLIBDIR)\(.*\);\1%{l_prefix}/lib\2;' \
+ Makefile
%build
# fix braindead FreeBSD
@@ -74,10 +93,8 @@
esac
# build XV
-%{l_make} %{l_mflags} \
-JPEGINC=-I%{l_prefix}/include \
-JPEGLIB=%{l_prefix}/lib/libjpeg.a \
-CCOPTS="$CCHACK"
+JPEGLIB=%{l_prefix}/lib/libjpeg.a
+%{l_make} %{l_mflags} CCOPTS="$CCHACK"
%install
rm -rf $RPM_BUILD_ROOT
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1589 -r1.1590 news.txt
--- openpkg-web/news.txt 20 Sep 2002 15:27:23 - 1.1589
+++ openpkg-web/news.txt 20 Sep 2002 15:28:27 - 1.1590
@@ -1,3 +1,4 @@
+20-Sep-2002: Upgraded package: P
20-Sep-2002: Upgraded package: P
20-Sep-2002: Upgraded package: P
20-Sep-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/xv xv.spec
OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Aug-2002 17:52:27
Branch: HEAD Handle: 2002081216522700
Modified files:
openpkg-src/xv xv.spec
Log:
Replaced hardcoded X11 directories with flexible OpenPKG x11 package rc
script query. Thanks to Ralf for this idea.
Summary:
RevisionChanges Path
1.2 +2 -2 openpkg-src/xv/xv.spec
Index: openpkg-src/xv/xv.spec
$ cvs diff -u -r1.1 -r1.2 xv.spec
--- openpkg-src/xv/xv.spec9 Aug 2002 19:19:54 - 1.1
+++ openpkg-src/xv/xv.spec12 Aug 2002 15:52:27 - 1.2
@@ -33,7 +33,7 @@
Group:XWindow
License: XV
Version: 3.10a
-Release: 20020809
+Release: 20020812
# list of sources
Source0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.tar.gz
@@ -70,7 +70,7 @@
# fix braindead FreeBSD
CCHACK="-O"
case "%{l_target}" in
-*-freebsd*)CCHACK="-O -I/usr/X11R6/include/ -L/usr/X11R6/lib/";;
+*-freebsd*)CCHACK="-O -I`%{l_prefix}/etc/rc --query x11_incdir`
-L`%{l_prefix}/etc/rc --query x11_libdir`";;
esac
# build XV
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
