SPECS (AC-branch): kdegraphics.spec - merge with HEAD
glen
glen at pld-linux.org
Thu Feb 14 22:50:23 CET 2008
Author: glen Date: Thu Feb 14 21:50:23 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merge with HEAD
---- Files affected:
SPECS:
kdegraphics.spec (1.177.2.18 -> 1.177.2.19)
---- Diffs:
================================================================
Index: SPECS/kdegraphics.spec
diff -u SPECS/kdegraphics.spec:1.177.2.18 SPECS/kdegraphics.spec:1.177.2.19
--- SPECS/kdegraphics.spec:1.177.2.18 Thu Feb 14 22:46:58 2008
+++ SPECS/kdegraphics.spec Thu Feb 14 22:50:18 2008
@@ -3,9 +3,7 @@
# Conditional build:
%bcond_without kuickshow # do not build kuickshow app (omit imlib req)
%bcond_with protections # protections against fair use (printing and copying)
-%bcond_with hidden_visibility # pass '--fvisibility=hidden'
- # & '--fvisibility-inlines-hidden'
- # to g++
+%bcond_with hidden_visibility # no gcc hidden visibility
#
%define _state stable
%define _minlibsevr 9:%{version}
@@ -28,6 +26,7 @@
Patch1: %{name}-allowprint.patch
Patch2: kde-ac260-lt.patch
Patch3: %{name}-kuickshow-imlib.patch
+URL: http://www.kde.org/
BuildRequires: OpenEXR-devel >= 1.1.0
BuildRequires: OpenGL-GLU-devel
BuildRequires: ed
@@ -54,8 +53,6 @@
BuildConflicts: kdegraphics-mrml
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _noautoreqdep libGL.so.1 libGLU.so.1
-
%description
Graphic applications for the K Desktop Environment.
@@ -523,8 +520,8 @@
embedded in KDE applications.
%description kviewshell -l pl.UTF-8
-Szkielet KDE dla przeglądarek grafiki pozwala na zagnieżdżnie w
-aplikacjach KDE.
+Szkielet KDE dla przeglądarek grafiki, pozwalający na zagnieżdżanie
+ich w aplikacjach KDE.
%prep
%setup -q
@@ -605,6 +602,7 @@
%find_lang kview --with-kde
rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kruler.desktop
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -631,6 +629,7 @@
%attr(755,root,root) %{_libdir}/libkimageviewer.so
%attr(755,root,root) %{_libdir}/libksvg.so
%attr(755,root,root) %{_libdir}/libtext2path.so
+%{_libdir}/*.la
%{_includedir}/*.h
%{_includedir}/dom/*
%{_includedir}/ksvg
@@ -639,15 +638,12 @@
%files daemonwatcher
%defattr(644,root,root,755)
-%{_libdir}/kde3/kded_daemonwatcher.la
%attr(755,root,root) %{_libdir}/kde3/kded_daemonwatcher.so
%{_datadir}/services/kded/daemonwatcher.desktop
%files kamera -f kamera.lang
%defattr(644,root,root,755)
-%{_libdir}/kde3/kcm_kamera.la
%attr(755,root,root) %{_libdir}/kde3/kcm_kamera.so
-%{_libdir}/kde3/kio_kamera.la
%attr(755,root,root) %{_libdir}/kde3/kio_kamera.so
%{_datadir}/services/camera.protocol
%{_desktopdir}/kde/kamera.desktop
@@ -669,7 +665,6 @@
%files kdvi -f kdvi.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kdvi
-%{_libdir}/kde3/kdvipart.la
%attr(755,root,root) %{_libdir}/kde3/kdvipart.so
%{_datadir}/apps/kdvi
%{_datadir}/config.kcfg/kdvi.kcfg
@@ -681,9 +676,7 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kfax
%attr(755,root,root) %{_bindir}/kfaxview
-%{_libdir}/libkfaximage.la
%attr(755,root,root) %{_libdir}/libkfaximage.so
-%{_libdir}/kde3/kfaxviewpart.la
%attr(755,root,root) %{_libdir}/kde3/kfaxviewpart.so
%{_datadir}/apps/kfax/
%{_datadir}/apps/kfaxview
@@ -696,9 +689,7 @@
%files kfile
%defattr(644,root,root,755)
-%{_libdir}/kde3/gsthumbnail.la
%attr(755,root,root) %{_libdir}/kde3/gsthumbnail.so
-%{_libdir}/kde3/kfile_*.la
%attr(755,root,root) %{_libdir}/kde3/kfile_*.so
%{_datadir}/services/gsthumbnail.desktop
%{_datadir}/services/kfile_*.desktop
@@ -706,7 +697,6 @@
%files kgamma -f kgamma.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/xf86gammacfg
-%{_libdir}/kde3/kcm_kgamma.la
%attr(755,root,root) %{_libdir}/kde3/kcm_kgamma.so
%{_datadir}/apps/kgamma
%{_desktopdir}/kde/kgamma.desktop
@@ -715,9 +705,7 @@
%files kghostview -f kghostview.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kghostview
-%{_libdir}/libkghostviewlib.la
%attr(755,root,root) %{_libdir}/libkghostviewlib.so.*.*.*
-%{_libdir}/kde3/libkghostviewpart.la
%attr(755,root,root) %{_libdir}/kde3/libkghostviewpart.so
%{_datadir}/apps/kconf_update/kghostview.upd
%attr(755,root,root) %{_datadir}/apps/kconf_update/update-to-xt-names.pl
@@ -737,15 +725,10 @@
%files kmrml
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mrmlsearch
-%{_libdir}/libkdeinit_mrmlsearch.la
%attr(755,root,root) %{_libdir}/libkdeinit_mrmlsearch.so
-%{_libdir}/kde3/kcm_kmrml.la
%attr(755,root,root) %{_libdir}/kde3/kcm_kmrml.so
-%{_libdir}/kde3/kio_mrml.la
%attr(755,root,root) %{_libdir}/kde3/kio_mrml.so
-%{_libdir}/kde3/libkmrmlpart.la
%attr(755,root,root) %{_libdir}/kde3/libkmrmlpart.so
-%{_libdir}/kde3/mrmlsearch.la
%attr(755,root,root) %{_libdir}/kde3/mrmlsearch.so
%{_datadir}/mimelnk/text/mrml.desktop
%{_datadir}/services/mrml.protocol
@@ -763,7 +746,6 @@
%files kooka -f kooka.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kooka
-%{_libdir}/libkscan.la
%attr(755,root,root) %{_libdir}/libkscan.so.*.*.*
%{_datadir}/apps/kooka
%{_datadir}/config/kookarc
@@ -774,7 +756,6 @@
%files kpdf -f kpdf.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kpdf
-%{_libdir}/kde3/libkpdfpart.la
%attr(755,root,root) %{_libdir}/kde3/libkpdfpart.so
%{_datadir}/apps/kpdf
%{_datadir}/apps/kpdfpart
@@ -786,9 +767,7 @@
%files kpovmodeler -f kpovmodeler.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kpovmodeler
-%{_libdir}/libkpovmodeler.la
%attr(755,root,root) %{_libdir}/libkpovmodeler.so.*
-%{_libdir}/kde3/libkpovmodelerpart.la
%attr(755,root,root) %{_libdir}/kde3/libkpovmodelerpart.so*
%{_datadir}/apps/kpovmodeler
%{_desktopdir}/kde/kpovmodeler.desktop
@@ -811,15 +790,10 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/printnodetest
%attr(755,root,root) %{_bindir}/svgdisplay
-%{_libdir}/libksvg.la
%attr(755,root,root) %{_libdir}/libksvg.so.*.*.*
-%{_libdir}/libtext2path.la
%attr(755,root,root) %{_libdir}/libtext2path.so.*.*.*
-%{_libdir}/kde3/libksvgplugin.la
%attr(755,root,root) %{_libdir}/kde3/libksvgplugin.so
-%{_libdir}/kde3/libksvgrendererlibart.la
%attr(755,root,root) %{_libdir}/kde3/libksvgrendererlibart.so
-%{_libdir}/kde3/svgthumbnail.la
%attr(755,root,root) %{_libdir}/kde3/svgthumbnail.so
%{_datadir}/apps/ksvg
%{_datadir}/services/ksvglibartcanvas.desktop
@@ -831,9 +805,7 @@
%files kuickshow -f kuickshow.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kuickshow
-%{_libdir}/libkdeinit_kuickshow.la
%attr(755,root,root) %{_libdir}/libkdeinit_kuickshow.so
-%{_libdir}/kde3/kuickshow.la
%attr(755,root,root) %{_libdir}/kde3/kuickshow.so
%{_datadir}/apps/kuickshow
%{_desktopdir}/kde/kuickshow.desktop
@@ -843,33 +815,19 @@
%files kview -f kview.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kview
-%{_libdir}/libkdeinit_kview.la
%attr(755,root,root) %{_libdir}/libkdeinit_kview.so
-%{_libdir}/libkimageviewer.la
%attr(755,root,root) %{_libdir}/libkimageviewer.so.*.*.*
-%{_libdir}/kde3/kcm_kviewcanvasconfig.la
%attr(755,root,root) %{_libdir}/kde3/kcm_kviewcanvasconfig.so
-%{_libdir}/kde3/kcm_kviewgeneralconfig.la
%attr(755,root,root) %{_libdir}/kde3/kcm_kviewgeneralconfig.so
-%{_libdir}/kde3/kcm_kviewpluginsconfig.la
%attr(755,root,root) %{_libdir}/kde3/kcm_kviewpluginsconfig.so
-%{_libdir}/kde3/kcm_kviewviewerpluginsconfig.la
%attr(755,root,root) %{_libdir}/kde3/kcm_kviewviewerpluginsconfig.so
-%{_libdir}/kde3/kview.la
%attr(755,root,root) %{_libdir}/kde3/kview.so
-%{_libdir}/kde3/kview_browserplugin.la
%attr(755,root,root) %{_libdir}/kde3/kview_browserplugin.so
-%{_libdir}/kde3/kview_effectsplugin.la
%attr(755,root,root) %{_libdir}/kde3/kview_effectsplugin.so
-%{_libdir}/kde3/kview_presenterplugin.la
%attr(755,root,root) %{_libdir}/kde3/kview_presenterplugin.so
-%{_libdir}/kde3/kview_scannerplugin.la
%attr(755,root,root) %{_libdir}/kde3/kview_scannerplugin.so
-%{_libdir}/kde3/libkviewcanvas.la
%attr(755,root,root) %{_libdir}/kde3/libkviewcanvas.so
-%{_libdir}/kde3/libkviewviewer.la
%attr(755,root,root) %{_libdir}/kde3/libkviewviewer.so
-%{_libdir}/kde3/libphotobook.la
%attr(755,root,root) %{_libdir}/kde3/libphotobook.so
%{_datadir}/apps/kview
%{_datadir}/apps/kviewviewer
@@ -891,11 +849,8 @@
%files kviewshell
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kviewshell
-%{_libdir}/libkmultipage.la
%attr(755,root,root) %{_libdir}/libkmultipage.so.*.*.*
-%{_libdir}/kde3/emptymultipagepart.la
%attr(755,root,root) %{_libdir}/kde3/emptymultipagepart.so
-%{_libdir}/kde3/kviewerpart.la
%attr(755,root,root) %{_libdir}/kde3/kviewerpart.so
%{_datadir}/apps/kviewerpart
%{_datadir}/apps/kviewshell
@@ -904,9 +859,7 @@
%{_datadir}/servicetypes/kmultipage.desktop
%{_iconsdir}/*/*/*/kviewshell.png
# New
-%{_libdir}/kde3/djvuviewpart.la
%attr(755,root,root) %{_libdir}/kde3/djvuviewpart.so
-%{_libdir}/kde3/libdjvu.la
%attr(755,root,root) %{_libdir}/kde3/libdjvu.so
%{_datadir}/apps/djvumultipage.rc
%{_datadir}/config.kcfg/djvumultipage.kcfg
@@ -918,6 +871,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.177.2.19 2008-02-14 21:50:18 glen
+- merge with HEAD
+
Revision 1.177.2.18 2008-02-14 21:46:58 glen
- convert to utf8
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdegraphics.spec?r1=1.177.2.18&r2=1.177.2.19&f=u
More information about the pld-cvs-commit
mailing list