rpms/qpdfview
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into f21

Browse Source 
Conflicts:
	qpdfview.spec
This commit is contained in:
TI_Eugene 2014-10-06 09:54:21 +04:00
commit 7f43669b34
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qpdfview-0.4-desktop.patch
View File

@ -1,11 +0,0 @@
--- miscellaneous/qpdfview.desktop.in.orig 2012-10-02 11:32:06.571057438 +0400
+++ miscellaneous/qpdfview.desktop.in 2012-10-02 11:32:25.604085118 +0400
@@ -2,7 +2,7 @@
Type=Application
Terminal=false
Name=qpdfview
-Icon=DATA_INSTALL_PATH/qpdfview.svg
+Icon=qpdfview
GenericName=PDF viewer
Comment=A tabbed PDF viewer using the poppler library.
Categories=Viewer;Office;

BIN
qpdfview-0.4.10.tar.gz
View File

Binary file not shown.

BIN
qpdfview-0.4.12.tar.gz Normal file
View File

Binary file not shown.

24
qpdfview.spec
View File

@ -1,12 +1,16 @@
Name: qpdfview
<<<<<<< HEAD
Version: 0.4.10
Release: 3%{?dist}
=======
Version: 0.4.12
Release: 1%{?dist}
>>>>>>> master
License: GPLv2+
Summary: Tabbed PDF Viewer
Url: https://launchpad.net/qpdfview
Source0: https://launchpad.net/qpdfview/trunk/0.4.5/+download/%{name}-%{version}.tar.gz
Patch0: %{name}-0.4-desktop.patch
BuildRequires: desktop-file-utils file-devel cups-devel hicolor-icon-theme pkgconfig(poppler-qt4) pkgconfig(libspectre) pkgconfig(QtGui) pkgconfig(QtSql) pkgconfig(QtDBus) pkgconfig(zlib)
BuildRequires: desktop-file-utils file-devel cups-devel hicolor-icon-theme pkgconfig(poppler-qt4) pkgconfig(libspectre) pkgconfig(QtGui) pkgconfig(QtDBus) pkgconfig(zlib)
%if 0%{?centos_version}
Requires: qt-sqlite
%else
@ -20,7 +24,6 @@ It provides a clear and simple graphical user interface using the Qt framework.
%prep
%setup -q
%patch0
%build
lrelease-qt4 qpdfview.pro
@ -54,15 +57,28 @@ rm -f %{buildroot}/%{_datadir}/%{name}/%{name}_ast.qm
%{_libdir}/%{name}/
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/help*.html
%{_datadir}/%{name}/%{name}.svg
#{_datadir}/%{name}/%{name}.svg
%{_datadir}/applications/%{name}.desktop
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_mandir}/man?/*
%changelog
<<<<<<< HEAD
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
=======
* Mon Oct 06 2014 TI_Eugene <ti.eugene@gmail.com> 0.4.12-1
- Version bump
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Mon Jul 21 2014 TI_Eugene <ti.eugene@gmail.com> 0.4.11-1
- Version bump
>>>>>>> master
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild