packages: xv/xv.spec - removed all current patches - added one big jumbopat...

[evil]

Author: evil                         Date: Fri Jan 15 18:04:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- removed all current patches
- added one big jumbopatch (and patch for it)
- reworked PLD patch to apply against jumbopatched xv

---- Files affected:
packages/xv:
   xv.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: packages/xv/xv.spec
diff -u packages/xv/xv.spec:1.40 packages/xv/xv.spec:1.41
--- packages/xv/xv.spec:1.40	Sun Jul 12 05:31:24 2009
+++ packages/xv/xv.spec	Fri Jan 15 19:04:04 2010
@@ -10,7 +10,7 @@
 Summary(uk.UTF-8):	Програма для перегляду та перетворення файлів зображень для X
 Name:		xv
 Version:	3.10a
-Release:	31
+Release:	32
 License:	Shareware
 Group:		X11/Applications/Graphics
 Source0:	ftp://ftp.cis.upenn.edu/pub/xv/%{name}-%{version}.tar.gz
@@ -23,26 +23,14 @@
 Source4:	%{name}.png
 Source5:	%{name}-non-english-Xman-pages.tar.bz2
 # Source5-md5:	4e5a6582ad76974309ca8bf8fb56b671
+Source6:	http://dl.sourceforge.net/project/png-mng/XV%20jumbo%20patches/20070520/%{name}-%{version}-jumbo-patches-20070520.tar.gz
 Patch0:		%{name}-PLD.patch
-Patch1:		%{name}-FLmask.v2.1.patch
-Patch2:		%{name}-JPEG.patch
-Patch3:		%{name}-TIFF.patch
-Patch4:		%{name}-croppad.patch
-Patch5:		%{name}-deepcolor.patch
-Patch6:		%{name}-exceed_grab_patch.txt
-Patch7:		%{name}-gifpatch
-Patch8:		%{name}-grabpatch
-Patch9:		%{name}-longname.patch
-Patch10:	%{name}-mp-tiff-patch
-Patch11:	%{name}-pdf.patch
-Patch12:	%{name}-png-fix2.patch
-Patch13:	%{name}-vispatch
-Patch14:	%{name}-c.patch
+Patch1:		http://www.gregroelofs.com/code/%{name}-3.10a-enhancements.20070520-20081216.diff
 URL:		http://www.trilon.com/xv/xv.html
+BuildRequires:	jasper-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:	libtiff-devel
 BuildRequires:	libpng-devel
-BuildRequires:	sed
+BuildRequires:	libtiff-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXt-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -113,22 +101,10 @@
 %prep
 %setup -q
 tar xvfz %{SOURCE1}
-patch -p1 --quiet < xvpng.diff
+tar xvfz %{SOURCE6} -C ../
+patch -p1 < ../xv-3.10a-jumbo-fix-enh-patch-20070520.txt
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p1
-%patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p1
 tar zxf %{SOURCE2}
 
 %build
@@ -144,24 +120,28 @@
 
 %{__make} install \
 	BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+	DOCDIR=$RPM_BUILD_ROOT%{_docdir} \
 	MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
 	LIBDIR=$RPM_BUILD_ROOT%{_libdir}
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
-mv -f xvman310a manual
 
 bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT/../xv-3.10a-jumbo-fix-enh-patch-20070520.txt
 
 %files
 %defattr(644,root,root,755)
-%doc README docs/xvdocs.ps BUGS CHANGELOG IDEAS CPMASK 00_README manual
+%doc README BUGS CHANGELOG IDEAS
 %attr(755,root,root) %{_bindir}/*
 %{_desktopdir}/xv.desktop
 %{_pixmapsdir}/*
+%doc %{_docdir}/README.jumbo
+%doc %{_docdir}/xvdocs.pdf
+%doc %{_docdir}/xvdocs.ps
 %{_mandir}/man1/*
 %lang(fi) %{_mandir}/fi/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
@@ -172,6 +152,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2010/01/15 18:04:04  evil
+- removed all current patches
+- added one big jumbopatch (and patch for it)
+- reworked PLD patch to apply against jumbopatched xv
+
 Revision 1.40  2009/07/12 03:31:24  arekm
 - release 31
 
@@ -308,25 +293,3 @@
 Revision 1.1  1999/10/15 15:54:02  baggins
 - first version
 
-* Wed Feb 17 1999 Otto J. Makela <otto at cc.jyu.fi>
-- integrated Japanese flmask patches
-
-* Tue Aug  4 1998 Jeff Johnson <jbj at redhat.com>
-- build root
-
-* Wed Jun 10 1998 Prospector System <bugs at redhat.com>
-- translations modified for de
-
-* Fri May 08 1998 Prospector System <bugs at redhat.com>
-- translations modified for de, fr, tr
-
-* Wed Oct 22 1997 Donnie Barnes <djb at redhat.com>
-- added wmconfig entry
-
-* Thu Oct 16 1997 Donnie Barnes <djb at redhat.com>
-- various spec file cleanups
-- added patch to manipulate PNG files
-
-* Mon Aug 25 1997 Erik Troan <ewt at redhat.com>
-- built against glibc
-- incorporated new jpegv6 patch from the author's web site
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xv/xv.spec?r1=1.40&r2=1.41&f=u