Author: jwrdegoede Update of /cvs/free/rpms/comical/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25260 Modified Files: .cvsignore sources Added Files: comical-0.8-jpe.patch comical-0.8-optflags.patch comical-0.8-wxicon.patch comical.desktop comical.spec Log Message: * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 0.8-6 - Fix building with latest wxWidgets 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 comical-0.8-wxicon.patch: --- NEW FILE comical-0.8-wxicon.patch --- diff -up comical-0.8/src/ComicalApp.cpp~ comical-0.8/src/ComicalApp.cpp --- comical-0.8/src/ComicalApp.cpp~ 2008-09-27 20:48:34.000000000 +0200 +++ comical-0.8/src/ComicalApp.cpp 2008-09-27 20:48:34.000000000 +0200 @@ -25,6 +25,7 @@ * * ***************************************************************************/ +#include <wx/icon.h> #include "ComicalApp.h" #include "ComicalFrame.h" #include <wx/log.h> --- NEW FILE comical.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Comical GenericName=Comic Archive Reader Comment=Open .cbr & .cbz files Exec=comical Icon=comical.png StartupNotify=false Terminal=false Type=Application Categories=Application;Graphics;X-Livna; Version=0.9.4 X-Desktop-File-Install-Version=0.4 --- NEW FILE comical.spec --- Name: comical Version: 0.8 Release: 6%{?dist} Summary: GUI comic book viewer License: GPLv2 Group: Applications/Multimedia URL: http://comical.sourceforge.net/ Source0: http://download.sourceforge.net/comical/comical-%{version}.tar.gz Source1: comical.png Source2: comical.desktop Patch0: comical-0.8-jpe.patch Patch1: comical-0.8-optflags.patch Patch2: comical-0.8-wxicon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK2-devel BuildRequires: desktop-file-utils Requires: unzip %description Comical is a fully featured GUI comic book viewer using wxWidgets. It can view CBZ and CBR format files. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %build make %install rm -rf $RPM_BUILD_ROOT 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 livna \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Livna \ %{SOURCE2} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS COPYING README TODO %{_bindir}/comical %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 0.8-6 - Fix building with latest wxWidgets * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-5 - rebuild * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.8-4 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Tue Sep 26 2006 Andreas Thienemann <andreas(a)bawue.net&gt; 0.8-3 - Bump for rebuild. * Mon Jul 31 2006 Andreas Thienemann <andreas(a)bawue.net&gt; 0.8-2 - Import into livna due to libunrar licensing issues. - Bumped to 0.8-2 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 0.8-1 - bump for 0.8 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 0.7-2 - bump for FC5 * Thu Jan 5 2006 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 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(a)redhat.com&gt; 0.4-9 - fix x86_64 by not using std::min * Fri Jun 3 2005 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 0.4-8 - add dist tag * Sun Apr 10 2005 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 0.4-7 - Support images that end in ".jpe". Most likely, .jpeg files that were truncated by saving/compressing. * Sat Apr 9 2005 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 0.4-6 - Minor spec cleanups. * Sat Apr 9 2005 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 0.4-5 - Enhance the sort algorithm to be more intelligent. * Mon Apr 4 2005 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 0.4-4 - drop --with-gtk from configure, unused - backout "bracket" patch, it breaks if [ or ] are in the directory path * Mon Apr 4 2005 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 0.4-3 - Add sort menu option to enable/disable sorting of images in archive - Add logo from Brian Pepple - Add desktop entry - Add patch to gracefully deal with the absence of unrar * Sun Apr 3 2005 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 0.4-2 - patch for handling files with [ or ] in their names * Sun Apr 3 2005 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 0.4-1 - inital package for Fedora Extras - CBR support only works with unrar, but we can't have that as a dep due to licensing issues with unrar. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/comical/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:48:22 -0000 1.1 +++ .cvsignore 27 Sep 2008 18:55:04 -0000 1.2 @@ -0,0 +1,2 @@ +comical-0.8.tar.gz +comical.png Index: sources =================================================================== RCS file: /cvs/free/rpms/comical/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:48:22 -0000 1.1 +++ sources 27 Sep 2008 18:55:04 -0000 1.2 @@ -0,0 +1,2 @@ +f5808e28fd5a2a3d21b59cdad10eca3d comical-0.8.tar.gz +7e38455e43a0bee5994caa3bd6b901bb comical.png