rpms/comical/FC-4 comical-0.8-jpe.patch, NONE, 1.1 comical-0.8-optflags.patch, NONE, 1.1 comical.spec, 1.7, 1.8 sources, 1.3, 1.4

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/comical/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629/FC-4

Modified Files:
	comical.spec sources 
Added Files:
	comical-0.8-jpe.patch comical-0.8-optflags.patch 
Log Message:

Bump comical to 0.8


comical-0.8-jpe.patch:

--- NEW FILE comical-0.8-jpe.patch ---
--- comical-0.8/src/ComicBookZIP.cpp.BAD	2006-04-24 20:41:07.000000000 -0500
+++ comical-0.8/src/ComicBookZIP.cpp	2006-04-24 20:41:30.000000000 -0500
@@ -54,7 +54,7 @@
 	do {
 		unzGetCurrentFileInfo(ZipFile, fileInfo, namebuf, 1024, NULL, 0, NULL, 0);
 		page = wxString::FromAscii(namebuf);
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || 
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);
--- comical-0.8/src/ComicBookRAR.cpp.BAD	2006-04-24 20:41:56.000000000 -0500
+++ comical-0.8/src/ComicBookRAR.cpp	2006-04-24 20:42:15.000000000 -0500
@@ -67,7 +67,7 @@
 #else
 		page = wxString(header.FileName);
 #endif
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);

comical-0.8-optflags.patch:

--- NEW FILE comical-0.8-optflags.patch ---
--- comical-0.8/unrar/makefile.linux.BAD	2006-02-11 10:15:09.000000000 -0600
+++ comical-0.8/unrar/makefile.linux	2006-04-24 20:43:10.000000000 -0500
@@ -7,7 +7,7 @@
 
 # Linux using GCC
 CXX=g++
-CXXFLAGS=-O2 -fPIC
+CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS)
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 STRIP=strip
 AR=ar
--- comical-0.8/src/Makefile.BAD	2006-04-24 20:44:53.000000000 -0500
+++ comical-0.8/src/Makefile	2006-04-24 20:45:04.000000000 -0500
@@ -1,5 +1,5 @@
 INCLUDE = -I../unrar -I../unzip
-CFLAGS = -O2 -Wall -pipe
+CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
 CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
 
 .SUFFIXES: .cpp .png .h .d .o


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-4/comical.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- comical.spec	28 Feb 2006 21:36:34 -0000	1.7
+++ comical.spec	25 Apr 2006 02:04:39 -0000	1.8
@@ -1,21 +1,15 @@
 Name: comical
-Version: 0.7
-Release: 2%{?dist}
+Version: 0.8
+Release: 1%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://comical.sourceforge.net/
-Source0: http://download.sourceforge.net/comical/comical-0.7.tar.gz
+Source0: http://download.sourceforge.net/comical/comical-%{version}.tar.gz
 Source1: comical.png
 Source2: comical.desktop
-Patch0: comical-0.4-bracket.patch
-Patch1: comical-0.4-sort.patch
-Patch2: comical-0.4-nounrar.patch
-Patch3: comical-0.4-advancedsort.patch
-Patch4: comical-0.7-jpe.patch
-Patch5: comical-0.4-minfix.patch
-Patch6: comical-0.7-optflags.patch
-Patch7: comical-0.7-nostrip.patch
+Patch0: comical-0.8-jpe.patch
+Patch1: comical-0.8-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
@@ -28,17 +22,11 @@
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-make %{?_smp_mflags}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,6 +50,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.8-1
+- bump for 0.8
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-2
 - bump for FC5
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jan 2006 00:48:06 -0000	1.3
+++ sources	25 Apr 2006 02:04:39 -0000	1.4
@@ -1 +1 @@
-b60c94a005c034d1db8ff349acd7acf5  comical-0.7.tar.gz
+f5808e28fd5a2a3d21b59cdad10eca3d  comical-0.8.tar.gz