diff --git a/kdegraphics.spec b/kdegraphics.spec index d4bf586..277c0ad 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -1,7 +1,7 @@ %define sourcedir stable/%{version}/distribution/tar/generic/source %define is_release 1 %define beta %{nil} -%define rel 3 +%define rel 5 %define DATE 20020326 Version: 3.0.0 @@ -19,6 +19,7 @@ Release: 0.cvs%{DATE}.%{rel} Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{DATE}.tar.bz2 %endif Source1: cvs://anonymous@cvs.gphoto.sourceforge.net/cvsroot/gphoto/libgpio-20011225.tar.bz2 +Source900: gccver.c Icon: kde-icon.xpm Summary: K Desktop Environment - Graphics Applications Epoch: 7 @@ -41,6 +42,7 @@ capture utility); kview (image viewer for GIF, JPEG, TIFF, etc.). %package -n kamera Summary: Digital camera support for KDE Group: Applications/Multimedia +Requires: gphoto2 %description -n kamera Kamera adds support for digital cameras to KDE. @@ -258,6 +260,10 @@ CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS -fno-check-new" \ %else --without-kamera %endif +gcc -o gccver %{SOURCE900} +if [ "0`./gccver`" -lt 3001 ]; then + find . -name Makefile |xargs perl -pi -e "s,^CXXLD\s*=.*,\$& -release gcc`./gccver -v`,g" +fi make %{?smp_mflags} @@ -275,7 +281,16 @@ done %clean # rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name} $RPM_BUILD_DIR/%{name} +%post -n kviewshell -p /sbin/ldconfig +%postun -n kviewshell -p /sbin/ldconfig + +%post -n libkscan -p /sbin/ldconfig +%postun -n libkscan -p /sbin/ldconfig + %ifnarch alpha +%post -n kamera -p /sbin/ldconfig +%postun -n kamera -p /sbin/ldconfig + %files -n kamera %defattr(-,root,root) %{_libdir}/libgpio.so* @@ -310,22 +325,22 @@ done %files -n kfax %defattr(-,root,root) %{_bindir}/kfax -%{_libdir}/libkfax.* +%{_libdir}/libkfax*.* %{_datadir}/icons/*/*/*/kfax.png %{_datadir}/applnk/Graphics/kfax.desktop %{_datadir}/apps/kfax %files -n kfile-pdf %defattr(-,root,root) -%{_libdir}/kde3/kfile_pdf.* -%{_libdir}/kde3/kfile_ps.* -%{_datadir}/services/kfile_pdf.* -%{_datadir}/services/kfile_ps.* +%{_libdir}/kde3/kfile_pdf*.* +%{_libdir}/kde3/kfile_ps*.* +%{_datadir}/services/kfile_pdf*.* +%{_datadir}/services/kfile_ps*.* %files -n kfile-png %defattr(-,root,root) -%{_libdir}/kde3/kfile_png.* -%{_datadir}/services/kfile_png.* +%{_libdir}/kde3/kfile_png*.* +%{_datadir}/services/kfile_png*.* %files -n kfract %defattr(-,root,root) @@ -340,7 +355,7 @@ done %{_datadir}/apps/kghostview %{_datadir}/icons/*/*/*/kghostview.png %{_datadir}/applnk/Graphics/kghostview.desktop -%{_libdir}/libkghostview.* +%{_libdir}/libkghostview*.* %{_bindir}/kghostview %doc %{_docdir}/HTML/en/kghostview @@ -386,7 +401,7 @@ done %files -n kuickshow %defattr(-,root,root) -%{_libdir}/kuickshow.* +%{_libdir}/kuickshow*.* %{_bindir}/kuickshow %{_datadir}/icons/*/*/*/kuickshow.png %{_datadir}/applnk/Graphics/kuickshow.desktop @@ -399,7 +414,7 @@ done %{_datadir}/icons/*/*/*/kview.png %{_datadir}/applnk/Graphics/kview.desktop %{_libdir}/libkviewpart* -%{_libdir}/kview.* +%{_libdir}/kview*.* %{_bindir}/kview %doc %{_docdir}/HTML/en/kview @@ -408,7 +423,6 @@ done %{_libdir}/libkviewerpart* %{_libdir}/libkmultipage* %{_libdir}/libkpagetest* -%{_libdir}/libkviewpart* %{_bindir}/kviewshell %{_datadir}/apps/kviewshell %{_datadir}/apps/kviewerpart @@ -426,7 +440,7 @@ done %{_datadir}/icons/*/*/*/palette_halftone.png %{_datadir}/icons/*/*/*/palette_lineart.png %{_datadir}/services/scanservice.desktop -%{_libdir}/libkscan.* +%{_libdir}/libkscan*.* %files -n libkscan-devel %defattr(-,root,root) @@ -444,6 +458,13 @@ done %endif %changelog +* Tue Apr 16 2002 Bernhard Rosenkraenzer 3.0.0-5 +- rename libraries + +* Mon Apr 8 2002 Bernhard Rosenkraenzer 3.0.0-4 +- Fix libkviewpart.* duplication (kview and kviewshell, #62749) +- Shut up rpmlint + * Fri Mar 29 2002 Bernhard Rosenkraenzer 3.0.0-3 - Obsolete the old monolithic package - Fix build with gcc 3.1 diff --git a/sources b/sources index 3f3bb6f..c6d27d9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e96d03be7d448586ddfa8dd81e267a94 kdegraphics-3.0.0.tar.bz2 +1576adc141e62caf1aa42b57f57fecc1 kdegraphics-3.0.0.tar.bz2 099a85087800df7af7552e3b16890916 libgpio-20011225.tar.bz2