Hello community, here is the log from the commit of package kdegraphics3 for openSUSE:Factory checked in at 2011-10-25 16:06:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdegraphics3 (Old) and /work/SRC/openSUSE:Factory/.kdegraphics3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdegraphics3", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdegraphics3/kdegraphics3.changes 2011-09-23 02:06:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdegraphics3.new/kdegraphics3.changes 2011-10-25 16:06:33.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 25 10:27:44 UTC 2011 - co...@suse.com + +- clean up spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics3.spec ++++++ --- /var/tmp/diff_new_pack.zsRSgZ/_old 2011-10-25 16:06:34.000000000 +0200 +++ /var/tmp/diff_new_pack.zsRSgZ/_new 2011-10-25 16:06:34.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package kdegraphics3 (Version 3.5.10) +# spec file for package kdegraphics3 # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,47 +15,48 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: kdegraphics3 Url: http://www.kde.org # skip-check-libtool-deps -BuildRequires: OpenEXR-devel fribidi-devel giflib-devel kdebase3 kdelibs3-devel -BuildRequires: kdelibs3-devel-doc net-snmp-devel qt3-devel-doc sane fdupes -%if %suse_version <= 1120 -BuildRequires: imlib-config imlib-devel -%endif -%if %suse_version > 1000 +BuildRequires: OpenEXR-devel +BuildRequires: fdupes +BuildRequires: fribidi-devel +BuildRequires: giflib-devel +BuildRequires: kdebase3 +BuildRequires: kdelibs3-devel +BuildRequires: kdelibs3-devel-doc +BuildRequires: net-snmp-devel +BuildRequires: qt3-devel-doc +BuildRequires: sane +%if 0%{?suse_version} <= 1120 +BuildRequires: imlib-config +BuildRequires: imlib-devel +%endif +BuildRequires: libexiv2-devel +BuildRequires: libgphoto2-devel +BuildRequires: texlive-devel +BuildRequires: texlive-latex BuildRequires: xpdf-tools +%if 0%{?suse_version} < 1210 +BuildRequires: libpoppler-devel +BuildRequires: libpoppler-qt3-devel %endif -%if %suse_version > 1010 -BuildRequires: libexiv2-devel libgphoto2-devel -%endif -%if %suse_version > 1020 -BuildRequires: texlive-devel texlive-latex -%else -BuildRequires: te_ams te_kpath te_latex -%endif -%if %suse_version < 1210 -BuildRequires: libpoppler-devel libpoppler-qt3-devel -%endif -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 BuildRequires: sane-backends-devel %endif License: GPL-2.0 Group: Productivity/Graphics/Viewers Provides: kdegraphics3-kfile-plugins Obsoletes: kdegraphics3-kfile-plugins -%if %suse_version <= 1120 +%if 0%{?suse_version} <= 1120 Provides: kuickshow Obsoletes: kuickshow %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) -Summary: Base Libraries for KDE Graphics Applications Version: 3.5.10 Release: 1 +Summary: Base Libraries for KDE Graphics Applications Source0: kdegraphics-%{version}.tar.bz2 Patch0: 3_5_BRANCH.diff Patch1: prefer-kpdf.diff @@ -69,12 +70,14 @@ Patch11: fix-kooka-desktop-icon.diff Patch12: kpdf-bug-487098.patch Patch13: xpdf-bnc546404.diff -%if %suse_version > 1140 +Requires: kdelibs3 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1140 Patch14: 001-fribidi.diff %endif Patch15: GSmartPointer-gcc46.patch Requires: ghostscript-x11 -%if %suse_version <= 1120 +%if 0%{?suse_version} <= 1120 Provides: kdegraphics3-viewer:/opt/kde3/bin/kuickshow %endif Provides: kdegraphics3:/opt/kde3/bin/ksnapshot @@ -104,34 +107,23 @@ - kdegraphics3-extra - - -Authors: --------- - The KDE Team <k...@kde.org> - %package devel License: GPL-2.0 -Requires: kdegraphics3 kdelibs3-devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/KDE +Requires: kdegraphics3 +Requires: kdelibs3-devel %description devel This package contains all necessary include files and libraries needed to develop applications that require these. - - -Authors: --------- - The KDE Team <k...@kde.org> - %package imaging License: GPL-2.0 # usesubdirs kview kiconedit kuickshow kview kiconedit Summary: Image-Related KDE Applications Group: Productivity/Graphics/Viewers -%if %suse_version <= 1120 +%if 0%{?suse_version} <= 1120 Provides: kdegraphics3:/opt/kde3/bin/kuickshow %endif Obsoletes: kdegraphics3-viewer @@ -142,13 +134,11 @@ * kolourpaint - simple paint application * kview - another modular picture viewer -%if %suse_version <= 1120 +%if 0%{?suse_version} <= 1120 * kuickshow - a fast picture viewer %endif - -Authors: -------- The KDE Team <k...@kde.org> @@ -168,12 +158,6 @@ * kruler - a desktop ruler for measuring pixels - - -Authors: --------- - The KDE Team <k...@kde.org> - %package 3D License: GPL-2.0+ # usesubdirs kpovmodeler @@ -184,19 +168,13 @@ %description 3D KPovModeler can create scenes for rendering with POV-Ray. - - -Authors: --------- - The KDE Team <k...@kde.org> - %package tex License: GPL-2.0 # usesubdirs kdvi # usefiles /opt/kde3/bin/kviewshell Summary: DVI File Viewer Group: Productivity/Publishing/TeX/Frontends -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 Requires: texlive %else Requires: tetex @@ -209,19 +187,13 @@ KDVI shows and prints DVI files. DVI files are generated by TeX and LaTeX. - - -Authors: --------- - The KDE Team <k...@kde.org> - %package scan License: GPL-2.0 -Provides: kooka kscanlib kdegraphics3-kooka -Obsoletes: kooka kscanlib kdegraphics3-kooka Summary: Kooka, the Scanning Program for KDE Group: Hardware/Scanner Requires: ocrad +Provides: kdegraphics3-kooka +Obsoletes: kdegraphics3-kooka %description scan Kooka is an image scanning program for KDE that uses the SANE library. @@ -237,54 +209,28 @@ open source OCR programs, ocrad and gocr are available as plugins to Kooka. - - -Authors: --------- - Klaas Freitag <frei...@suse.de> - %package fax License: GPL-2.0 # usesubdirs kfax kfaxview Summary: KDE fax viewer Group: Productivity/Graphics/Viewers -Provides: kdegraphics3:/opt/kde3/bin/kfax Requires: tiff +Provides: kdegraphics3:/opt/kde3/bin/kfax %description fax This package can show and print received fax files. - - -Authors: --------- - The KDE Team <k...@kde.org> - %package pdf License: GPL-2.0 # usesubdirs kpdf Summary: KDE PDF File Viewer Group: Productivity/Graphics/Viewers Provides: kdegraphics3:/opt/kde3/bin/kpdf -%if %suse_version > 1030 Requires: pdftools_any -%else -%if %suse_version > 1000 -Requires: xpdf-tools -%else -Requires: xpdf-config -%endif -%endif %description pdf This package contains KPDF, an application to show and print PDF files. - - -Authors: --------- - The KDE Team <k...@kde.org> - %package postscript License: GPL-2.0 # usesubdirs kghostview @@ -296,12 +242,6 @@ This package contains KGhostView, an application to show and print Postscript files. - - -Authors: --------- - The KDE Team <k...@kde.org> - %package kamera License: GPL-2.0 # usesubdirs kamera @@ -314,12 +254,6 @@ cameras that are connected via serial port, while usb-cameras are directly supported by the kernel. - - -Authors: --------- - The KDE Team <k...@kde.org> - %prep %setup -q -n kdegraphics-%{version} %patch0 @@ -329,16 +263,14 @@ %patch6 -p1 %patch7 -p1 %patch8 -%if %suse_version > 1020 -%if %suse_version <= 1140 +%if 0%{?suse_version} <= 1140 %patch9 %endif -%endif %patch10 %patch11 %patch12 %patch13 -%if %suse_version > 1140 +%if 0%{?suse_version} > 1140 %patch14 -p1 %endif %patch15 -p1 @@ -349,38 +281,38 @@ update_admin %build -export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" . /etc/opt/kde3/common_options export CXXFLAGS="-I/usr/include/agg2/ $CXXFLAGS -fpermissive" -%if %suse_version > 1140 +%if 0%{?suse_version} > 1140 sed -i 's|DO_NOT_COMPILE ksvg|DO_NOT_COMPILE|g' configure sed -i 's|as-needed|no-as-needed|g' configure %endif ./configure $configkde -%if %suse_version > 1140 +%if 0%{?suse_version} > 1140 sed -i 's|DO_NOT_COMPILE ksvg|DO_NOT_COMPILE|g' configure cat >>confdefs.h <<_ACEOF #define HAVE_FRIBIDI 1 _ACEOF %endif -make %{?jobs:-j %jobs} +make %{?_smp_mflags} %install . /etc/opt/kde3/common_options -make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET -rm $RPM_BUILD_ROOT/opt/kde3/share/applnk/Graphics/kruler.desktop -mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/applnk/.hidden -mv $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/kgamma.desktop $RPM_BUILD_ROOT/opt/kde3/share/applnk/.hidden/ -mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/{16x16,32x32,48x48,64x64}/apps/ +make DESTDIR=%{buildroot} $INSTALL_TARGET +rm %{buildroot}/opt/kde3/share/applnk/Graphics/kruler.desktop +mkdir -p %{buildroot}/opt/kde3/share/applnk/.hidden +mv %{buildroot}/opt/kde3/share/applications/kde/kgamma.desktop %{buildroot}/opt/kde3/share/applnk/.hidden/ +mkdir -p %{buildroot}/opt/kde3/share/icons/hicolor/{16x16,32x32,48x48,64x64}/apps/ for i in {16,32,48,64}; do - cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/devices/scanner.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kooka.png; + cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/devices/scanner.png %{buildroot}/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kooka.png; done %suse_update_desktop_file kpovmodeler Graphics 3DGraphics %suse_update_desktop_file kolourpaint Graphics RasterGraphics %suse_update_desktop_file kiconedit Graphics RasterGraphics %suse_update_desktop_file kview Graphics Viewer -%if %suse_version <= 1120 +%if 0%{?suse_version} <= 1120 %suse_update_desktop_file kuickshow Graphics Viewer %endif %suse_update_desktop_file kooka Graphics Scanning @@ -395,12 +327,12 @@ %suse_update_desktop_file kfaxview Office Viewer %suse_update_desktop_file kamera kde_post_install -%if %suse_version > 1030 -%fdupes $RPM_BUILD_ROOT +%if 0%{?suse_version} > 1030 +%fdupes %{buildroot} %endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post %run_ldconfig @@ -461,24 +393,24 @@ /opt/kde3/bin/ksnapshot /opt/kde3/bin/kviewshell /opt/kde3/bin/xf86gammacfg -/opt/kde3/%_lib/kde3/kcm_kgamma.* -/opt/kde3/%_lib/kde3/kfile_bmp.* -/opt/kde3/%_lib/kde3/kfile_dvi.* -/opt/kde3/%_lib/kde3/kfile_ico.* -/opt/kde3/%_lib/kde3/kfile_jpeg.* -/opt/kde3/%_lib/kde3/kfile_pcx.* -/opt/kde3/%_lib/kde3/kfile_pn* -/opt/kde3/%_lib/kde3/kfile_t* -/opt/kde3/%_lib/kde3/kfile_xbm.* -/opt/kde3/%_lib/kde3/kfile_ps.* -/opt/kde3/%_lib/kde3/kfile_dds.* -/opt/kde3/%_lib/kde3/kfile_xpm.* -/opt/kde3/%_lib/kde3/gsthumbnail.* -/opt/kde3/%_lib/kde3/kfile_rgb.* -/opt/kde3/%_lib/kde3/emptymultipagepart.* +/opt/kde3/%{_lib}/kde3/kcm_kgamma.* +/opt/kde3/%{_lib}/kde3/kfile_bmp.* +/opt/kde3/%{_lib}/kde3/kfile_dvi.* +/opt/kde3/%{_lib}/kde3/kfile_ico.* +/opt/kde3/%{_lib}/kde3/kfile_jpeg.* +/opt/kde3/%{_lib}/kde3/kfile_pcx.* +/opt/kde3/%{_lib}/kde3/kfile_pn* +/opt/kde3/%{_lib}/kde3/kfile_t* +/opt/kde3/%{_lib}/kde3/kfile_xbm.* +/opt/kde3/%{_lib}/kde3/kfile_ps.* +/opt/kde3/%{_lib}/kde3/kfile_dds.* +/opt/kde3/%{_lib}/kde3/kfile_xpm.* +/opt/kde3/%{_lib}/kde3/gsthumbnail.* +/opt/kde3/%{_lib}/kde3/kfile_rgb.* +/opt/kde3/%{_lib}/kde3/emptymultipagepart.* /opt/kde3/share/services/kfile_ps.desktop -/opt/kde3/%_lib/kde3/kviewerpart.* -/opt/kde3/%_lib/libkmultipage.* +/opt/kde3/%{_lib}/kde3/kviewerpart.* +/opt/kde3/%{_lib}/libkmultipage.* /opt/kde3/share/applications/kde/ksnapshot.desktop %dir /opt/kde3/share/applnk/.hidden /opt/kde3/share/applnk/.hidden/kgamma.desktop @@ -506,31 +438,31 @@ /opt/kde3/share/servicetypes/kmultipage.desktop /opt/kde3/share/config.kcfg/kviewshell.kcfg %doc %lang(en) /opt/kde3/share/doc/HTML/en/ksnapshot -/opt/kde3/%_lib/kde3/djvuviewpart.la -/opt/kde3/%_lib/kde3/djvuviewpart.so -/opt/kde3/%_lib/kde3/kfile_gif.la -/opt/kde3/%_lib/kde3/kfile_gif.so -/opt/kde3/%_lib/kde3/kfile_raw.la -/opt/kde3/%_lib/kde3/kfile_raw.so -/opt/kde3/%_lib/kde3/libdjvu.la -/opt/kde3/%_lib/kde3/libdjvu.so +/opt/kde3/%{_lib}/kde3/djvuviewpart.la +/opt/kde3/%{_lib}/kde3/djvuviewpart.so +/opt/kde3/%{_lib}/kde3/kfile_gif.la +/opt/kde3/%{_lib}/kde3/kfile_gif.so +/opt/kde3/%{_lib}/kde3/kfile_raw.la +/opt/kde3/%{_lib}/kde3/kfile_raw.so +/opt/kde3/%{_lib}/kde3/libdjvu.la +/opt/kde3/%{_lib}/kde3/libdjvu.so /opt/kde3/share/apps/djvumultipage.rc /opt/kde3/share/config.kcfg/djvumultipage.kcfg /opt/kde3/share/services/djvumultipage.desktop /opt/kde3/share/services/kfile_gif.desktop /opt/kde3/share/services/kfile_raw.desktop -%if %suse_version < 1210 -/opt/kde3/%_lib/kde3/kfile_pdf.* +%if 0%{?suse_version} < 1210 +/opt/kde3/%{_lib}/kde3/kfile_pdf.* /opt/kde3/share/services/kfile_pdf.desktop %endif -/opt/kde3/%_lib/kde3/kfile_exr.* +/opt/kde3/%{_lib}/kde3/kfile_exr.* /opt/kde3/share/services/kfile_exr.desktop /opt/kde3/bin/printnodetest /opt/kde3/bin/svgdisplay -/opt/kde3/%_lib/kde3/libksvg* -/opt/kde3/%_lib/kde3/svgthumbnail.* -/opt/kde3/%_lib/libksvg.* -/opt/kde3/%_lib/libtext2path.* +/opt/kde3/%{_lib}/kde3/libksvg* +/opt/kde3/%{_lib}/kde3/svgthumbnail.* +/opt/kde3/%{_lib}/libksvg.* +/opt/kde3/%{_lib}/libtext2path.* /opt/kde3/share/apps/ksvg /opt/kde3/share/services/ksvg* /opt/kde3/share/services/svgthumbnail.desktop @@ -541,21 +473,21 @@ /opt/kde3/bin/kiconedit /opt/kde3/bin/kview /opt/kde3/bin/kolourpaint -%if %suse_version <= 1120 +%if 0%{?suse_version} <= 1120 /opt/kde3/bin/kuickshow -/opt/kde3/%_lib/kde3/kuickshow.* +/opt/kde3/%{_lib}/kde3/kuickshow.* /opt/kde3/share/applications/kde/kuickshow.desktop /opt/kde3/share/apps/kuickshow /opt/kde3/share/icons/*/*x*/*/kuickshow.png -/opt/kde3/%_lib/libkdeinit_kuickshow.* +/opt/kde3/%{_lib}/libkdeinit_kuickshow.* %endif -/opt/kde3/%_lib/kde3/kcm_kview* -/opt/kde3/%_lib/kde3/kview_* -/opt/kde3/%_lib/kde3/kview.* -/opt/kde3/%_lib/kde3/libkview* -/opt/kde3/%_lib/kde3/libphotobook.* -/opt/kde3/%_lib/libkdeinit_kview.* -/opt/kde3/%_lib/libkimageviewer.* +/opt/kde3/%{_lib}/kde3/kcm_kview* +/opt/kde3/%{_lib}/kde3/kview_* +/opt/kde3/%{_lib}/kde3/kview.* +/opt/kde3/%{_lib}/kde3/libkview* +/opt/kde3/%{_lib}/kde3/libphotobook.* +/opt/kde3/%{_lib}/libkdeinit_kview.* +/opt/kde3/%{_lib}/libkimageviewer.* /opt/kde3/share/applications/kde/kiconedit.desktop /opt/kde3/share/applications/kde/kview.desktop /opt/kde3/share/applications/kde/kolourpaint.desktop @@ -594,7 +526,7 @@ %defattr(-,root,root) /opt/kde3/share/icons/*/??x??/*/palette_*.png /opt/kde3/share/icons/*/*/*/kooka.* -/opt/kde3/%_lib/libkscan* +/opt/kde3/%{_lib}/libkscan* /opt/kde3/bin/kooka /opt/kde3/share/apps/kooka /opt/kde3/share/applications/kde/kooka.desktop @@ -605,8 +537,8 @@ %files 3D %defattr(-,root,root) /opt/kde3/bin/kpovmodeler -/opt/kde3/%_lib/libkpovmodeler.* -/opt/kde3/%_lib/kde3/libkpovmodelerpart.* +/opt/kde3/%{_lib}/libkpovmodeler.* +/opt/kde3/%{_lib}/kde3/libkpovmodelerpart.* /opt/kde3/share/applications/kde/kpovmodeler.desktop /opt/kde3/share/apps/kpovmodeler /opt/kde3/share/icons/*/*/*/kpovmodeler_doc.* @@ -616,7 +548,7 @@ %files tex %defattr(-,root,root) /opt/kde3/bin/kdvi -/opt/kde3/%_lib/kde3/kdvipart.* +/opt/kde3/%{_lib}/kde3/kdvipart.* /opt/kde3/share/applications/kde/kdvi.desktop /opt/kde3/share/apps/kdvi /opt/kde3/share/config.kcfg/kdvi.kcfg @@ -632,10 +564,10 @@ /opt/kde3/share/apps/kfax /opt/kde3/share/icons/*/*/*/kfaxview.* /opt/kde3/share/icons/*/*/*/kfax.* -/opt/kde3/%_lib/kde3/kfaxviewpart.la -/opt/kde3/%_lib/kde3/kfaxviewpart.so -/opt/kde3/%_lib/libkfaximage.la -/opt/kde3/%_lib/libkfaximage.so +/opt/kde3/%{_lib}/kde3/kfaxviewpart.la +/opt/kde3/%{_lib}/kde3/kfaxviewpart.so +/opt/kde3/%{_lib}/libkfaximage.la +/opt/kde3/%{_lib}/libkfaximage.so /opt/kde3/share/applications/kde/kfaxview.desktop %dir /opt/kde3/share/apps/kfaxview /opt/kde3/share/apps/kfaxview/kviewshell.rc @@ -645,7 +577,7 @@ %files pdf %defattr(-,root,root) /opt/kde3/bin/kpdf -/opt/kde3/%_lib/kde3/libkpdfpart.* +/opt/kde3/%{_lib}/kde3/libkpdfpart.* /opt/kde3/share/applications/kde/kpdf.desktop /opt/kde3/share/apps/kpdf* /opt/kde3/share/icons/*/*/*/kpdf.* @@ -656,8 +588,8 @@ %files postscript %defattr(-,root,root) /opt/kde3/bin/kghostview -/opt/kde3/%_lib/libkghostviewlib.* -/opt/kde3/%_lib/kde3/libkghostviewpart.* +/opt/kde3/%{_lib}/libkghostviewlib.* +/opt/kde3/%{_lib}/kde3/libkghostviewpart.* /opt/kde3/share/applications/kde/kghostview.desktop /opt/kde3/share/apps/kghostview /opt/kde3/share/config.kcfg/kghostview.kcfg @@ -669,8 +601,8 @@ %files kamera %defattr(-,root,root) -/opt/kde3/%_lib/kde3/kcm_kamera.* -/opt/kde3/%_lib/kde3/kio_kamera.* +/opt/kde3/%{_lib}/kde3/kcm_kamera.* +/opt/kde3/%{_lib}/kde3/kio_kamera.* /opt/kde3/share/icons/*/*/*/camera.* /opt/kde3/share/icons/*/*/*/camera_test.* /opt/kde3/share/services/camera.protocol -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
