Re: rpms/comical/devel comical-0.8-minizip.patch, NONE, 1.1 comical-0.8-libunrar.patch, 1.2, 1.3 comical.spec, 1.4, 1.5
On Sunday, 26 October 2008 at 00:29, Andreas Thienemann wrote:
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> - 0.8-9
- Removed use of private miniunzip copy, use system-wide minizip library.
[...]
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
Isn't that -Lunzip a leftover from bundled miniunzip? It was removed in the
other patch.
+ 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/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
Still necessary?
CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
Regards,
R.
--
Fedora http://fedoraproject.org/wiki/User:Rathann
RPMFusion http://rpmfusion.org | MPlayer http://mplayerhq.hu
"Faith manages."
-- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"