diff --git a/.cvsignore b/.cvsignore index 682431d..cce224a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -qcomicbook-0.4.0.tar.gz +qcomicbook-0.5.0.tar.gz diff --git a/qcomicbook.spec b/qcomicbook.spec index 472d7ec..0fcd3d6 100644 --- a/qcomicbook.spec +++ b/qcomicbook.spec @@ -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 archives. %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" -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 +%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 -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 - 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 - 0.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 51b8977..7aaaa21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a0ef74e5478d66e3538a362ec691999d qcomicbook-0.4.0.tar.gz +485646a63e4ba3ff79535cc3fced328d qcomicbook-0.5.0.tar.gz