rpms/comical/devel comical-0.8-libunrar.patch, NONE, 1.1 comical.desktop, 1.1, 1.2 comical.spec, 1.3, 1.4

[Andreas Thienemann]

Author: ixs

Update of /cvs/nonfree/rpms/comical/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8612

Modified Files:
	comical.desktop comical.spec 
Added Files:
	comical-0.8-libunrar.patch 
Log Message:
* Sat Oct 25 2008 Andreas Thienemann <andreas at bawue.net> - 0.8-8
- Removed use of private libunrar copy, use systemwide one.


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 22:51:26.000000000 +0200
+++ comical-0.8/Makefile	2008-10-25 22:51:37.000000000 +0200
@@ -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/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
@@ -1,4 +1,4 @@
-INCLUDE = -I../unrar -I../unzip
+INCLUDE = -Ilibunrar -I../unzip
 CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
 CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
 


Index: comical.desktop
===================================================================
RCS file: /cvs/nonfree/rpms/comical/devel/comical.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comical.desktop	3 Aug 2008 14:11:38 -0000	1.1
+++ comical.desktop	25 Oct 2008 21:24:08 -0000	1.2
@@ -8,6 +8,6 @@
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Application;Graphics;X-Livna;
+Categories=Application;Graphics;
 Version=0.9.4
 X-Desktop-File-Install-Version=0.4


Index: comical.spec
===================================================================
RCS file: /cvs/nonfree/rpms/comical/devel/comical.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- comical.spec	16 Oct 2008 18:12:48 -0000	1.3
+++ comical.spec	25 Oct 2008 21:24:08 -0000	1.4
@@ -1,6 +1,6 @@
 Name: comical
 Version: 0.8
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
@@ -11,37 +11,45 @@
 Patch0: comical-0.8-jpe.patch
 Patch1: comical-0.8-optflags.patch
 Patch2: comical-0.8-wxicon.patch
+Patch3: comical-0.8-libunrar.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
-Requires: unzip
+BuildRequires: libunrar-devel
+
 
 %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
+rm -rf unrar
+
 
 %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 +58,18 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/%{name}.png
 
+
 %changelog
-* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-7
+* Sat Oct 25 2008 Andreas Thienemann <andreas at bawue.net> - 0.8-8
+- Removed use of private libunrar copy, use systemwide 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