rpms/comical/devel comical-0.7-jpe.patch, NONE, 1.1 comical-0.7-nostrip.patch, NONE, 1.1 comical-0.7-optflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 comical.spec, 1.5, 1.6 sources, 1.2, 1.3

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	.cvsignore comical.spec sources 
Added Files:
	comical-0.7-jpe.patch comical-0.7-nostrip.patch 
	comical-0.7-optflags.patch 
Log Message:

Update to 0.7


comical-0.7-jpe.patch:

--- NEW FILE comical-0.7-jpe.patch ---
--- comical-0.7/src/ComicBookZIP.cpp.BAD	2006-01-05 17:39:58.000000000 -0600
+++ comical-0.7/src/ComicBookZIP.cpp	2006-01-05 17:40:31.000000000 -0600
@@ -47,7 +47,7 @@
 	wxZipEntry *entry;
 	while ((entry = zipFile->GetNextEntry()) != NULL) {
 		page = entry->GetName();
-		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(5).Upper() == wxT(".TIFF") || page.Right(4).Upper() == wxT(".TIF") ||
 			page.Right(4).Upper() == wxT(".GIF") ||
 			page.Right(4).Upper() == wxT(".PNG"))
--- comical-0.7/src/ComicBookRAR.cpp.BAD	2006-01-05 18:00:37.000000000 -0600
+++ comical-0.7/src/ComicBookRAR.cpp	2006-01-05 18:00:48.000000000 -0600
@@ -63,7 +63,7 @@
 #else
 		page = wxString(HeaderData.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(5).Upper() == wxT(".TIFF") || page.Right(4).Upper() == wxT(".TIF") ||
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))

comical-0.7-nostrip.patch:

--- NEW FILE comical-0.7-nostrip.patch ---
--- comical-0.7/Makefile.BAD	2006-01-05 18:17:52.000000000 -0600
+++ comical-0.7/Makefile	2006-01-05 18:17:59.000000000 -0600
@@ -14,7 +14,6 @@
 
 comical: $(ALL.O) unrar/libunrar.a
 	$(CC) -o $@ $(ALL.O) $(LDFLAGS)
-	$(STRIP) $@
 
 unrar/libunrar.a:
 	$(MAKE) lib -C unrar -f makefile.linux

comical-0.7-optflags.patch:

--- NEW FILE comical-0.7-optflags.patch ---
--- comical-0.7/Makefile.BAD	2006-01-05 18:08:30.000000000 -0600
+++ comical-0.7/Makefile	2006-01-05 18:08:45.000000000 -0600
@@ -1,7 +1,7 @@
 CC = `wx-config --cxx`
 LD = `wx-config --ld`
 INCLUDE = -Iunrar
-CFLAGS =  `wx-config --cxxflags` -O2 -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRARDLL -D_UNIX $(INCLUDE)
+CFLAGS =  `wx-config --cxxflags` -O2 -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRARDLL -D_UNIX $(INCLUDE) $(RPM_OPT_FLAGS)
 LDFLAGS = `wx-config --libs` -Lunrar -lunrar
 STRIP = strip
 
--- comical-0.7/unrar/makefile.linux.BAD	2006-01-05 18:15:53.000000000 -0600
+++ comical-0.7/unrar/makefile.linux	2006-01-05 18:16:03.000000000 -0600
@@ -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
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2005 03:49:47 -0000	1.2
+++ .cvsignore	6 Jan 2006 00:48:12 -0000	1.3
@@ -1 +1,2 @@
 comical-0.4.tar.gz
+comical-0.7.tar.gz


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/comical.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- comical.spec	4 Jun 2005 16:48:34 -0000	1.5
+++ comical.spec	6 Jan 2006 00:48:12 -0000	1.6
@@ -1,23 +1,25 @@
 Name: comical
-Version: 0.4
-Release: 9%{?dist}
+Version: 0.7
+Release: 1%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://comical.sourceforge.net/
-Source0: http://jathey.home.comcast.net/comical-0.4.tar.gz
+Source0: http://download.sourceforge.net/comical/comical-0.7.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.4-jpe.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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
-Requires: unzip, bzip2
+Requires: unzip
 
 %description
 Comical is a fully featured GUI comic book viewer using wxWidgets. It 
@@ -27,19 +29,21 @@
 %prep
 %setup -q
 #%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#%patch1 -p1
+#%patch2 -p1
+#%patch3 -p1
 %patch4 -p1
-%patch5 -p1
+#%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
-%configure
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m0755 comical $RPM_BUILD_ROOT%{_bindir}
 
 install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor fedora                            \
@@ -58,6 +62,11 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1
+- bump to 0.7
+- disable all the sort patches, the 0.7 sort is no better than the 
+  original 0.4 sort, but they changed how they did it, so the old sort
+  patches would have to be reworked... and I'm not motivated right now.
 * Sat Jun  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4-9
 - fix x86_64 by not using std::min
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2005 03:49:47 -0000	1.2
+++ sources	6 Jan 2006 00:48:12 -0000	1.3
@@ -1 +1 @@
-ad7c93b5527b2ea4fde2bbed6eab920c  comical-0.4.tar.gz
+b60c94a005c034d1db8ff349acd7acf5  comical-0.7.tar.gz