rpms/comical/devel comical-0.4-minfix.patch, NONE, 1.1 comical.spec, 1.4, 1.5

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/comical/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1548/devel

Modified Files:
	comical.spec 
Added Files:
	comical-0.4-minfix.patch 
Log Message:

Fix x86_64


comical-0.4-minfix.patch:

--- NEW FILE comical-0.4-minfix.patch ---
--- comical-0.4/src/pstream.h.BAD	2005-06-04 06:37:56.128181576 -0500
+++ comical-0.4/src/pstream.h	2005-06-04 06:39:41.270197560 -0500
@@ -1527,7 +1527,8 @@
     bool
     basic_pstreambuf<C,T>::fill_buffer()
     {
-      int npb = std::min(this->gptr()-this->eback(), static_cast<int>(pbsz));
+#define min_xy(x,y) x < y ? x : y
+      int npb = min_xy(this->gptr()-this->eback(), static_cast<int>(pbsz));
 
       std::memmove(rbuffer()+pbsz-npb, this->gptr()-npb, npb*sizeof(char_type));
 


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/comical.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- comical.spec	3 Jun 2005 15:17:05 -0000	1.4
+++ comical.spec	4 Jun 2005 16:48:34 -0000	1.5
@@ -1,6 +1,6 @@
 Name: comical
 Version: 0.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
@@ -13,6 +13,7 @@
 Patch2: comical-0.4-nounrar.patch
 Patch3: comical-0.4-advancedsort.patch
 Patch4: comical-0.4-jpe.patch
+Patch5: comical-0.4-minfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
@@ -30,6 +31,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %configure
@@ -56,6 +58,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sat Jun  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4-9
+- fix x86_64 by not using std::min
+
 * Fri Jun  3 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4-8
 - add dist tag