rpms/kdegraphics/F-9 kdegraphics-4.1.0-kde#160860.patch, NONE, 1.1 kdegraphics.spec, 1.151, 1.152
Rex Dieter
rdieter at fedoraproject.org
Fri Aug 22 17:04:46 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/kdegraphics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9325
Modified Files:
kdegraphics.spec
Added Files:
kdegraphics-4.1.0-kde#160860.patch
Log Message:
* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-5
- fix "last page is not printed" (kde #160860)
kdegraphics-4.1.0-kde#160860.patch:
--- NEW FILE kdegraphics-4.1.0-kde#160860.patch ---
diff -up kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp.kde#160860 kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp
--- kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp.kde#160860 2008-07-24 08:48:55.000000000 -0500
+++ kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp 2008-08-20 09:26:52.000000000 -0500
@@ -865,6 +865,9 @@ bool PDFGenerator::print( QPrinter& prin
{
userMutex()->unlock();
delete psConverter;
+#ifdef HAVE_POPPLER_0_7
+ tf.close();
+#endif
int ret = Okular::FilePrinter::printFile( printer, tempfilename,
Okular::FilePrinter::SystemDeletesFiles,
Okular::FilePrinter::ApplicationSelectsPages,
Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/kdegraphics.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- kdegraphics.spec 12 Aug 2008 13:29:10 -0000 1.151
+++ kdegraphics.spec 22 Aug 2008 17:04:16 -0000 1.152
@@ -5,19 +5,23 @@
Summary: K Desktop Environment - Graphics Applications
Epoch: 7
Version: 4.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Name: kdegraphics
-Obsoletes: kdegraphics4 < %{version}-%{release}
+#Obsoletes: kdegraphics4 < %{version}-%{release}
Provides: kdegraphics4 = %{version}-%{release}
Group: Applications/Multimedia
License: GPLv2
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegraphics-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## upstream patches
Patch100: kdegraphics-4.1.0-printing-review-crash.patch
Patch101: kdegraphics-4.1.0-update-configuration.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# http://bugs.kde.org/160860
+Patch102: kdegraphics-4.1.0-kde#160860.patch
BuildRequires: kde-filesystem >= 4
BuildRequires: kdelibs4-devel >= %{version}
@@ -55,7 +59,6 @@
Obsoletes: gwenview < 2
Provides: gwenview = 2
-
%description
Graphics applications, including
* gwenview (an image viewer)
@@ -77,15 +80,17 @@
Group: Development/Libraries
Summary: Developer files for %{name}
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: kdegraphics4-devel < %{version}-%{release}
+#Obsoletes: kdegraphics4-devel < %{version}-%{release}
Provides: kdegraphics4-devel = %{version}-%{release}
Requires: kdelibs4-devel
Requires: pkgconfig
%if ! 0%{?omit_kde3_conflicts}
## FIXME: handle upgrade path for F-10 -- Rex
-Conflicts: libkexiv2-devel libkdcraw-devel libkipi-devel
-#Obsoletes: libkexiv2-devel libkdcraw-devel libkipi-devel
-#Provides: libkexiv2-devel libkdcraw-devel libkipi-devel
+# remaining apps depending on these: kipi-plugins (me), kphotoalbum (me),
+# showimg (mailed)
+Conflicts: libkdcraw-devel < 0.2.0, libkexiv2-devel < 0.2.0, libkipi-devel < 0.2.0
+#Obsoletes: libkdcraw-devel < 0.2.0, libkexiv2-devel < 0.2.0, libkipi-devel < 0.2.0
+#Provides: libkdcraw-devel = 0.2.0, libkexiv2-devel = 0.2.0, libkipi-devel = 0.2.0
%endif
%description devel
%{summary}.
@@ -97,6 +102,8 @@
# upstream patches
%patch100 -p1 -b .printing-review-crash
%patch101 -p1 -b .update-configuration
+%patch102 -p1 -b .kde#160860
+
%build
@@ -188,6 +195,9 @@
%changelog
+* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-5
+- fix "last page is not printed" (kde #160860)
+
* Tue Aug 12 2008 Than Ngo <than at redhat.com> 4.1.0-4
- fix crash in printing review in okular
- update all the configuration each time a document is open in okular
More information about the fedora-extras-commits
mailing list