diff --git a/.cvsignore b/.cvsignore index 2a369bc..d2a0bc5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,5 @@ -kdegraphics-4.2.4.tar.bz2 +kdegraphics-4.2.90.tar.bz2 +kdegraphics-4.2.95.tar.bz2 +kdegraphics-4.2.96.tar.bz2 +kdegraphics-4.2.98.tar.bz2 +kdegraphics-4.3.0.tar.bz2 diff --git a/kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch b/kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch deleted file mode 100644 index 0b7ad49..0000000 --- a/kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur kdegraphics-4.2.2/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp kdegraphics-4.2.2-kolourpaint-kde#183850-workaround/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp ---- kdegraphics-4.2.2/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp 2008-12-21 21:19:06.000000000 +0100 -+++ kdegraphics-4.2.2-kolourpaint-kde#183850-workaround/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp 2009-04-03 15:23:49.000000000 +0200 -@@ -252,7 +252,7 @@ - // Copy RGB layer. - *destPixmapPtr = QPixmap (oldPixmap.width (), oldPixmap.height ()); - QPainter p (destPixmapPtr); -- p.drawPixmap (QPoint (0, 0), oldPixmap); -+ p.drawImage (QPoint (0, 0), oldPixmap.toImage()); - p.end (); - - // Copy mask layer (if any). diff --git a/kdegraphics.spec b/kdegraphics.spec index a4ab5b1..b459b1b 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -1,8 +1,3 @@ -%if 0%{?fedora} > 9 -%define obsolete_kde3_kipi 1 -%else -%define omit_kde3_conflicts 1 -%endif %ifnarch s390 s390x %define gphoto 1 @@ -12,7 +7,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 4.2.4 +Version: 4.3.0 Release: 1%{?dist} Name: kdegraphics @@ -23,9 +18,6 @@ Group: Applications/Multimedia License: GPLv2 URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2 -# work around Kolourpaint crash with Qt 4.5 (kde#183850) -# patch from the upstream bug report -Patch0: kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstream patches @@ -77,10 +69,8 @@ Graphics applications, including %package libs Summary: Runtime libraries for %{name} Group: System Environment/Libraries -%if 0%{?obsolete_kde3_kipi} Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0 -%endif -Requires: kdelibs4%{?_isa} >= %{version} +Requires: kdelibs4%{?isa} >= %{version} %description libs %{summary}. @@ -92,10 +82,8 @@ Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Provides: kdegraphics4-devel = %{version}-%{release} Requires: kdelibs4-devel Requires: pkgconfig -%if ! 0%{?omit_kde3_conflicts} Obsoletes: libkdcraw-devel < 0.4.0, libkexiv2-devel < 0.4.0, libkipi-devel < 0.2.0 Provides: libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.5.0-1, libkipi-devel = 0.3.0-1 -%endif %description devel %{summary}. @@ -108,7 +96,6 @@ Summary: A kioslave for displaying WinHelp files %prep %setup -q -n kdegraphics-%{version} -%patch0 -p1 -b .kolourpaint-kde#183850-workaround %build @@ -122,14 +109,8 @@ make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%if 0%{?omit_kde3_conflicts} -# Conflicts: libkexiv2-devel libkdcraw-devel libkipi-devel -rm -rf %{buildroot}%{_kde4_includedir}/lib{kexiv2,kdcraw,kipi}/ -rm -f %{buildroot}%{_kde4_libdir}/lib{kexiv2,kdcraw,kipi}.so -rm -f %{buildroot}%{_libdir}/pkgconfig/lib{kexiv2,kdcraw,kipi}.pc -%endif +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %clean @@ -194,10 +175,12 @@ fi %{_kde4_iconsdir}/hicolor/*/actions/* %endif %{_kde4_libdir}/kde4/kcm_kgamma.so +%{_kde4_libdir}/kde4/mobithumbnail.so %{_kde4_libdir}/kde4/okularGenerator_*.so %{_kde4_libdir}/kde4/okularpart.so +%{_kde4_libdir}/kde4/rawthumbnail.so %{_kde4_libdir}/kde4/svgpart.so -%{_datadir}/dbus-1/interfaces/* +%{_datadir}/dbus-1/interfaces/*.xml %{_kde4_docdir}/HTML/en/*/ %{_kde4_iconsdir}/hicolor/*/apps/gwenview.* %{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.* @@ -224,14 +207,14 @@ fi %endif %{_kde4_libdir}/libokularcore.so.1* %{_kde4_libdir}/strigi/strigita_dvi.so +%{_kde4_libdir}/strigi/strigila_mobi.so + %files devel %defattr(-,root,root,-) -%if ! 0%{?omit_kde3_conflicts} %{_kde4_includedir}/libkdcraw/ %{_kde4_includedir}/libkexiv2/ %{_kde4_includedir}/libkipi/ -%endif %if 0%{?sane} %{_kde4_includedir}/libksane/ %endif @@ -248,19 +231,38 @@ fi %changelog -* Sat May 30 2009 Lukáš Tinkl - 4.2.4-1 -- KDE 4.2.4 +* Thu Jul 30 2009 Than Ngo - 4.3.0-1 +- 4.3.0 + +* Fri Jul 24 2009 Fedora Release Engineering - 7:4.2.98-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 22 2009 Than Ngo - 4.2.98-1 +- 4.3rc3 + +* Fri Jul 10 2009 Than Ngo - 4.2.96-1 +- 4.3rc2 -* Thu May 28 2009 Rex Dieter - 4.2.3-3 -- libs: fix Requires: kdelibs4 dep +* Fri Jun 26 2009 Than Ngo - 4.2.95-1 +- 4.3rc1 -* Wed May 27 2009 Rex Dieter - 4.2.3-2 +* Mon Jun 22 2009 Rex Dieter - 4.2.90-2 +- rebuild (poppler reduced libs) + +* Wed Jun 03 2009 Rex Dieter - 4.2.90-1 +- KDE-4.3 beta2 (4.2.90) + +* Wed May 27 2009 Rex Dieter - 4.2.85-3 - fix non-gphoto/sane build, for s390 (#502827) +- drop < F-10 conditionals + +* Wed May 20 2009 Kevin Kofler - 4.2.85-2 +- rebuild for new Poppler -* Sun May 03 2009 Than Ngo - 4.2.3-1 -- 4.2.3 +* Wed May 13 2009 Lukáš Tinkl - 4.2.85-1 +- KDE 4.3 beta 1 -* Mon Apr 27 2009 Rex Dieter 4.2.2-5 +* Mon Apr 27 2009 Rex Dieter - 4.2.2-5 - kio_msits subpkg, help avoid kchmviewer conflicts (#484861) * Wed Apr 22 2009 Than Ngo - 4.2.2-4 diff --git a/sources b/sources index 9b57c7a..7c5252e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34d7cf506dea9ab4dc78e9901c96391e kdegraphics-4.2.4.tar.bz2 +5d3838a2575a82777f00ced90332c41a kdegraphics-4.3.0.tar.bz2