rpms/qcomicbook/F-12 .cvsignore, 1.5, 1.6 qcomicbook.spec, 1.16, 1.17 sources, 1.5, 1.6

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qcomicbook/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9891

Modified Files:
	.cvsignore qcomicbook.spec sources 
Log Message:
* Sun Feb 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.5.0-1
- qcomicbook-0.5.0 (#560632)
- update URL
- convert build to use cmake
- BR: qt4-devel (to avoid ambiguity)
- drop needless/explicit Requires: qt
- drop needless .desktop vendor (f13+)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qcomicbook/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Apr 2008 16:56:10 -0000	1.5
+++ .cvsignore	12 Feb 2010 19:07:29 -0000	1.6
@@ -1 +1 @@
-qcomicbook-0.4.0.tar.gz
+qcomicbook-0.5.0.tar.gz


Index: qcomicbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qcomicbook/F-12/qcomicbook.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- qcomicbook.spec	27 Jul 2009 01:44:27 -0000	1.16
+++ qcomicbook.spec	12 Feb 2010 19:07:29 -0000	1.17
@@ -1,20 +1,19 @@
 Summary: A viewer for comic book archives
 Name: qcomicbook
-Version: 0.4.0
-Release: 5%{?dist}
+Version: 0.5.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
-URL: http://linux.bydg.org/~yogin
-
-Source: http://linux.bydg.org/~yogin/%{name}-%{version}.tar.gz
+URL: http://qcomicbook.linux-projects.net/
+Source: http://cloud.github.com/downloads/stolowski/QComicBook/qcomicbook-%{version}.tar.gz 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
-BuildRequires: qt-devel
-#BuildRequires: imlib2-devel
+
+BuildRequires: cmake
+BuildRequires: qt4-devel
 BuildRequires: libXmu-devel
 BuildRequires: libXi-devel
 BuildRequires: desktop-file-utils
-Requires: qt
 
 %description
 QComicBook is a viewer for comic book archives: rar, cbr,
@@ -32,20 +31,24 @@ gzip+bzip2 support and unace to handle a
 %setup -q
 
 %build
-%{configure}
-%{__make} %{?_smp_mflags}
+
+# out-of-source-tree build fails
+%{cmake} .
+
+%{__make} %{?_smp_mflags} 
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR="$RPM_BUILD_ROOT"
+%{__make} install/fast DESTDIR="$RPM_BUILD_ROOT" 
+
+%if 0%{?fedora} && 0%{?fedora} < 13
+desktop-file-install --vendor=fedora --delete-original                       \
+        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+%endif
 
-mkdir -p "$RPM_BUILD_ROOT"%{_datadir}/{applications,pixmaps}
-#cp -a fedora/%{name}.desktop "$RPM_BUILD_ROOT"%{_datadir}/applications
-cp -a fedora/%{name}.png "$RPM_BUILD_ROOT"%{_datadir}/pixmaps
-
-desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        fedora/%{name}.desktop
+%check
+desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/*%{name}.desktop
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -53,14 +56,20 @@ desktop-file-install --vendor fedora    
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS README ChangeLog COPYING THANKS TODO
-%docdir %{_datadir}/%{name}/help
 %{_bindir}/%{name}
-%{_datadir}/%{name}
 %{_mandir}/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Sun Feb 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.5.0-1
+- qcomicbook-0.5.0 (#560632)
+- update URL
+- convert build to use cmake
+- BR: qt4-devel (to avoid ambiguity)
+- drop needless/explicit Requires: qt
+- drop needless .desktop vendor (f13+)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qcomicbook/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Apr 2008 16:56:10 -0000	1.5
+++ sources	12 Feb 2010 19:07:29 -0000	1.6
@@ -1 +1 @@
-a0ef74e5478d66e3538a362ec691999d  qcomicbook-0.4.0.tar.gz
+485646a63e4ba3ff79535cc3fced328d  qcomicbook-0.5.0.tar.gz