rpms/comical/F-9 comical-0.8-libunrar.patch, NONE,
1.1 comical-0.8-minizip.patch, NONE, 1.1 comical.spec, 1.2, 1.3
Andreas Thienemann
ixs at rpmfusion.org
Thu Nov 6 12:51:41 CET 2008
Author: ixs
Update of /cvs/nonfree/rpms/comical/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10020
Modified Files:
comical.spec
Added Files:
comical-0.8-libunrar.patch comical-0.8-minizip.patch
Log Message:
* Sun Oct 26 2008 Andreas Thienemann <andreas at bawue.net> - 0.8-9
- Removed use of private miniunzip copy, use system-wide minizip library.
comical-0.8-libunrar.patch:
--- NEW FILE comical-0.8-libunrar.patch ---
diff -up comical-0.8/Makefile.orig comical-0.8/Makefile
--- 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
-comical: $(OBJS) unrar/libunrar.a unzip/libminiunzip.a
+comical: $(OBJS) unzip/libminiunzip.a
$(CC) -o $@ $(OBJS) $(LDFLAGS)
$(OBJS):
$(MAKE) -C src
-unrar/libunrar.a:
- $(MAKE) lib -C unrar -f makefile.linux
-
unzip/libminiunzip.a:
$(MAKE) -C unzip
@@ -39,7 +36,6 @@ clean:
distclean:
$(MAKE) clean
- $(MAKE) clean -C unrar -f makefile.linux
$(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 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 = -I../unzip
CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
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)
Index: comical.spec
===================================================================
RCS file: /cvs/nonfree/rpms/comical/F-9/comical.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comical.spec 16 Oct 2008 18:13:03 -0000 1.2
+++ comical.spec 6 Nov 2008 11:51:41 -0000 1.3
@@ -1,6 +1,6 @@
Name: comical
Version: 0.8
-Release: 7%{?dist}
+Release: 9%{?dist}
Summary: GUI comic book viewer
License: GPLv2
Group: Applications/Multimedia
@@ -11,37 +11,49 @@
Patch0: comical-0.8-jpe.patch
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
-Requires: unzip
+BuildRequires: libunrar-devel
+BuildRequires: minizip-devel
+BuildRequires: pkgconfig
+
%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
+%patch3 -p1
+%patch4 -p1
+rm -rf unrar unzip
+
%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 \
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_bindir}
+install -m0755 comical %{buildroot}%{_bindir}
+
+install -p -D -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+desktop-file-install \
+ --dir %{buildroot}%{_datadir}/applications \
%{SOURCE2}
+
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
%files
%defattr(-,root,root)
@@ -50,14 +62,21 @@
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/%{name}.png
+
%changelog
-* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-7
+* Sun Oct 26 2008 Andreas Thienemann <andreas at bawue.net> - 0.8-9
+- Removed use of private miniunzip copy, use system-wide minizip library.
+
+* Sat Oct 25 2008 Andreas Thienemann <andreas at bawue.net> - 0.8-8
+- 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
* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8-6
- Fix building with latest wxWidgets
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-5
+* 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
More information about the rpmfusion-commits
mailing list