diff --git a/.cvsignore b/.cvsignore index 841ca47..43f6d3e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ kdegraphics-4.0.99.tar.bz2 kdegraphics-4.1.0.tar.bz2 +kdegraphics-4.1.1.tar.bz2 diff --git a/kdegraphics-4.1.0-kde#160860.patch b/kdegraphics-4.1.0-kde#160860.patch deleted file mode 100644 index b5f9509..0000000 --- a/kdegraphics-4.1.0-kde#160860.patch +++ /dev/null @@ -1,13 +0,0 @@ -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, diff --git a/kdegraphics-4.1.0-printing-review-crash.patch b/kdegraphics-4.1.0-printing-review-crash.patch deleted file mode 100644 index fc4e0da..0000000 --- a/kdegraphics-4.1.0-printing-review-crash.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp.orig kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp ---- kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp.orig 2008-08-12 15:10:11.000000000 +0200 -+++ kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp 2008-08-12 15:10:47.000000000 +0200 -@@ -839,7 +839,11 @@ bool PDFGenerator::print( QPrinter& prin - pstitle = document()->currentDocument().fileName(); - } - -- bool forceRasterize = pdfOptionsPage->printForceRaster(); -+ bool forceRasterize = false; -+ if ( pdfOptionsPage ) -+ { -+ forceRasterize = pdfOptionsPage->printForceRaster(); -+ } - - Poppler::PSConverter *psConverter = pdfdoc->psConverter(); - diff --git a/kdegraphics-4.1.0-update-configuration.patch b/kdegraphics-4.1.0-update-configuration.patch deleted file mode 100644 index 50d7aa1..0000000 --- a/kdegraphics-4.1.0-update-configuration.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp (Revision 841347) -+++ kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp (Revision 841348) -@@ -261,8 +261,6 @@ - setFeature( FontInfo ); - setFeature( PrintPostscript ); - setFeature( ReadRawData ); -- // update the configuration -- reparseConfig(); - // generate the pixmapGeneratorThread - generatorThread = new PDFPixmapGeneratorThread( this ); - connect(generatorThread, SIGNAL(finished()), this, SLOT(threadFinished()), Qt::QueuedConnection); -@@ -392,7 +390,8 @@ - - loadPages(pagesVector, 0, false); - -- setAAOptions(); -+ // update the configuration -+ reparseConfig(); - - // the file has been loaded correctly - return true; diff --git a/kdegraphics.spec b/kdegraphics.spec index 0d163e4..9e1f418 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -4,8 +4,8 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 4.1.0 -Release: 6%{?dist} +Version: 4.1.1 +Release: 1%{?dist} Name: kdegraphics #Obsoletes: kdegraphics4 < %{version}-%{release} @@ -18,10 +18,6 @@ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegraphics-%{ 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 -# http://bugs.kde.org/160860 -Patch102: kdegraphics-4.1.0-kde#160860.patch BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} @@ -100,10 +96,6 @@ Provides: libkdcraw-devel = 0.2.0, libkexiv2-devel = 0.2.0, libkipi-devel = 0.2 %setup -q -n kdegraphics-%{version} # upstream patches -%patch100 -p1 -b .printing-review-crash -%patch101 -p1 -b .update-configuration -%patch102 -p1 -b .kde#160860 - %build @@ -168,6 +160,7 @@ rm -rf %{buildroot} %{_kde4_docdir}/HTML/en/ksnapshot/ %{_kde4_docdir}/HTML/en/kolourpaint/ %{_kde4_docdir}/HTML/en/kruler/ +%{_kde4_docdir}/HTML/en/kgamma/ %{_kde4_iconsdir}/hicolor/*/*/* %files libs @@ -195,6 +188,9 @@ rm -rf %{buildroot} %changelog +* Fri Aug 29 2008 Than Ngo 4.1.1-1 +- 4.1.1 + * Thu Aug 21 2008 Rex Dieter 4.1.0-6 - f10+: Obsoletes/Provides: libkdcraw-devel, libkexiv2-devel, libkipi-devel diff --git a/sources b/sources index 7297f5d..b500944 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2488d850b66eba1b542bded3def3e87e kdegraphics-4.1.0.tar.bz2 +e5475d37dc0a12b6ce7e6dbebceb9340 kdegraphics-4.1.1.tar.bz2