Author: ixs Update of /cvs/nonfree/rpms/comical/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv12208 Modified Files: comical-0.8-libunrar.patch comical.spec Added Files: comical-0.8-minizip.patch Log Message: * Sun Oct 26 2008 Andreas Thienemann <andreas(a)bawue.net&gt; - 0.8-9 - Removed use of private miniunzip copy, use system-wide minizip library. comical-0.8-minizip.patch: --- NEW FILE comical-0.8-minizip.patch --- diff -up comical-0.8/Makefile.orig comical-0.8/Makefile --- comical-0.8/Makefile.orig 2008-10-26 00:23:56.000000000 +0200 +++ comical-0.8/Makefile 2008-10-26 00:24:29.000000000 +0200 @@ -1,5 +1,5 @@ CC = `wx-config --cxx` -LDFLAGS = `wx-config --libs` -lunrar -Lunzip -lminiunzip +LDFLAGS = `wx-config --libs` `pkg-config minizip --libs` -lunrar INSTALL = install INSTALL_PROGRAM = $(INSTALL) prefix = /usr/local @@ -12,15 +12,12 @@ OBJS = $(patsubst %.cpp,%.o,$(wildcard s all: comical -comical: $(OBJS) unzip/libminiunzip.a +comical: $(OBJS) $(CC) -o $@ $(OBJS) $(LDFLAGS) $(OBJS): $(MAKE) -C src -unzip/libminiunzip.a: - $(MAKE) -C unzip - install: comical $(INSTALL_PROGRAM) comical $(DESTDIR)$(bindir)/comical @@ -36,7 +33,6 @@ clean: distclean: $(MAKE) clean - $(MAKE) clean -C unzip rm -f $(DEPS) bin2h src/bin2h.o .PHONY : install install-strip uninstall clean distclean diff -up comical-0.8/src/ComicBookZIP.cpp.orig comical-0.8/src/ComicBookZIP.cpp diff -up comical-0.8/src/Makefile.orig comical-0.8/src/Makefile --- comical-0.8/src/Makefile.orig 2008-10-26 00:24:36.000000000 +0200 +++ comical-0.8/src/Makefile 2008-10-26 00:25:44.000000000 +0200 @@ -1,4 +1,4 @@ -INCLUDE = -I../unzip +INCLUDE = `pkg-config minizip --cflags` CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS) CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE) comical-0.8-libunrar.patch: Index: comical-0.8-libunrar.patch =================================================================== RCS file: /cvs/nonfree/rpms/comical/devel/comical-0.8-libunrar.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- comical-0.8-libunrar.patch 25 Oct 2008 21:37:52 -0000 1.2 +++ comical-0.8-libunrar.patch 25 Oct 2008 22:29:31 -0000 1.3 @@ -1,6 +1,13 @@ diff -up comical-0.8/Makefile.orig comical-0.8/Makefile ---- comical-0.8/Makefile.orig 2008-10-25 22:51:26.000000000 +0200 -+++ comical-0.8/Makefile 2008-10-25 22:51:37.000000000 +0200 +--- comical-0.8/Makefile.orig 2008-10-25 23:52:38.000000000 +0200 ++++ comical-0.8/Makefile 2008-10-25 23:53:11.000000000 +0200 +@@ -1,5 +1,5 @@ + CC = `wx-config --cxx` +-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip ++LDFLAGS = `wx-config --libs` -lunrar -Lunzip -lminiunzip + INSTALL = install + INSTALL_PROGRAM = $(INSTALL) + prefix = /usr/local @@ -12,15 +12,12 @@ OBJS = $(patsubst %.cpp,%.o,$(wildcard s all: comical @@ -26,12 +33,24 @@ $(MAKE) clean -C unzip rm -f $(DEPS) bin2h src/bin2h.o +diff -up comical-0.8/src/ComicBookRAR.h.orig comical-0.8/src/ComicBookRAR.h +--- comical-0.8/src/ComicBookRAR.h.orig 2008-10-25 23:53:32.000000000 +0200 ++++ comical-0.8/src/ComicBookRAR.h 2008-10-25 23:53:41.000000000 +0200 +@@ -29,7 +29,7 @@ + #define _ComicBookRAR_h_ + + #include "ComicBook.h" +-#include "dll.hpp" ++#include "unrar/dll.hpp" + + class ComicBookRAR : public ComicBook { + diff -up comical-0.8/src/Makefile.orig comical-0.8/src/Makefile ---- comical-0.8/src/Makefile.orig 2008-10-25 22:51:45.000000000 +0200 -+++ comical-0.8/src/Makefile 2008-10-25 22:52:10.000000000 +0200 +--- comical-0.8/src/Makefile.orig 2008-10-25 23:53:15.000000000 +0200 ++++ comical-0.8/src/Makefile 2008-10-25 23:53:22.000000000 +0200 @@ -1,4 +1,4 @@ -INCLUDE = -I../unrar -I../unzip -+INCLUDE = -Iunrar -I../unzip ++INCLUDE = -I../unzip CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS) CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE) Index: comical.spec =================================================================== RCS file: /cvs/nonfree/rpms/comical/devel/comical.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- comical.spec 25 Oct 2008 21:24:08 -0000 1.4 +++ comical.spec 25 Oct 2008 22:29:31 -0000 1.5 @@ -12,10 +12,13 @@ Patch1: comical-0.8-optflags.patch Patch2: comical-0.8-wxicon.patch Patch3: comical-0.8-libunrar.patch +Patch4: comical-0.8-minizip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK2-devel BuildRequires: desktop-file-utils BuildRequires: libunrar-devel +BuildRequires: minizip-devel +BuildRequires: pkgconfig %description @@ -29,7 +32,8 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -rm -rf unrar +%patch4 -p1 +rm -rf unrar unzip %build @@ -60,8 +64,11 @@ %changelog +* Sun Oct 26 2008 Andreas Thienemann <andreas(a)bawue.net&gt; - 0.8-9 +- Removed use of private miniunzip copy, use system-wide minizip library. + * Sat Oct 25 2008 Andreas Thienemann <andreas(a)bawue.net&gt; - 0.8-8 -- Removed use of private libunrar copy, use systemwide one. +- Removed use of private libunrar copy, use system-wide one. * Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8-7 - rebuild