SPECS (AC-branch): kdeutils.spec - merge with HEAD
glen
glen at pld-linux.org
Thu Feb 14 23:53:34 CET 2008
Author: glen Date: Thu Feb 14 22:53:34 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merge with HEAD
---- Files affected:
SPECS:
kdeutils.spec (1.183.2.13 -> 1.183.2.14)
---- Diffs:
================================================================
Index: SPECS/kdeutils.spec
diff -u SPECS/kdeutils.spec:1.183.2.13 SPECS/kdeutils.spec:1.183.2.14
--- SPECS/kdeutils.spec:1.183.2.13 Thu Feb 14 23:50:54 2008
+++ SPECS/kdeutils.spec Thu Feb 14 23:53:29 2008
@@ -1,7 +1,8 @@
# $Revision$, $Date$
+#
# Conditional build:
-%bcond_without xmms # do not force xmms support
-%bcond_with hidden_visibility # pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
+%bcond_without xmms # do not force xmms support
+%bcond_with hidden_visibility # gcc hidden visibility
#
%define _state stable
%define _minlibsevr 9:%{version}
@@ -26,7 +27,7 @@
#Patch100: %{name}-branch.diff
Patch0: kde-common-PLD.patch
Patch1: kde-ac260-lt.patch
-Patch2: %{name}-kmilo-thinklight_notice.patch
+URL: http://www.kde.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: ed
@@ -560,10 +561,9 @@
%prep
%setup -q
-#%patch100 -p1
+#%patch100 -p0
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;Archiving;/' \
ark/ark.desktop
@@ -633,6 +633,9 @@
# unsupported
rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/locolor
+# drop la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+
%find_lang ark --with-kde
%find_lang irkick --with-kde
%find_lang KRegExpEditor --with-kde
@@ -678,21 +681,23 @@
%files devel
%defattr(644,root,root,755)
+%{_libdir}/libkcmlaptop.la
%attr(755,root,root) %{_libdir}/libkcmlaptop.so
+%{_libdir}/libkmilo.la
%attr(755,root,root) %{_libdir}/libkmilo.so
+%{_libdir}/libkhexeditcommon.la
%attr(755,root,root) %{_libdir}/libkhexeditcommon.so
+%{_libdir}/libkregexpeditorcommon.la
%attr(755,root,root) %{_libdir}/libkregexpeditorcommon.so
+%{_libdir}/libksimcore.la
%attr(755,root,root) %{_libdir}/libksimcore.so
%{_includedir}/*
%files ark -f ark.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/ark
-%{_libdir}/libkdeinit_ark.la
%attr(755,root,root) %{_libdir}/libkdeinit_ark.so
-%{_libdir}/kde3/ark.la
%attr(755,root,root) %{_libdir}/kde3/ark.so
-%{_libdir}/kde3/libarkpart.la
%attr(755,root,root) %{_libdir}/kde3/libarkpart.so
%{_datadir}/apps/ark
%{_datadir}/config.kcfg/ark.kcfg
@@ -703,9 +708,7 @@
%files kcalc -f kcalc.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kcalc
-%{_libdir}/libkdeinit_kcalc.la
%attr(755,root,root) %{_libdir}/libkdeinit_kcalc.so
-%{_libdir}/kde3/kcalc.la
%attr(755,root,root) %{_libdir}/kde3/kcalc.so
%{_datadir}/apps/kcalc
%{_datadir}/apps/kconf_update/kcalcrc.upd
@@ -716,7 +719,6 @@
%files kcharselect -f kcharselect.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kcharselect
-%{_libdir}/kde3/kcharselect_panelapplet.la
%attr(755,root,root) %{_libdir}/kde3/kcharselect_panelapplet.so
%{_datadir}/apps/kcharselect
%{_datadir}/apps/kconf_update/kcharselect.upd
@@ -727,11 +729,8 @@
%files kdelirc -f irkick.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/irkick
-%{_libdir}/libkdeinit_irkick.la
%attr(755,root,root) %{_libdir}/libkdeinit_irkick.so
-%{_libdir}/kde3/irkick.la
%attr(755,root,root) %{_libdir}/kde3/irkick.so
-%{_libdir}/kde3/kcm_kcmlirc.la
%attr(755,root,root) %{_libdir}/kde3/kcm_kcmlirc.so
%{_datadir}/apps/irkick
%{_datadir}/apps/profiles/klauncher.profile.xml
@@ -757,7 +756,6 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kdf
%attr(755,root,root) %{_bindir}/kwikdisk
-%{_libdir}/kde3/kcm_kdf.la
%attr(755,root,root) %{_libdir}/kde3/kcm_kdf.so
%{_datadir}/apps/kdf
%{_desktopdir}/kde/kcmdf.desktop
@@ -770,9 +768,7 @@
%files kedit -f kedit.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kedit
-%{_libdir}/libkdeinit_kedit.la
%attr(755,root,root) %{_libdir}/libkdeinit_kedit.so
-%{_libdir}/kde3/kedit.la
%attr(755,root,root) %{_libdir}/kde3/kedit.so
%{_datadir}/apps/kedit
%{_datadir}/config.kcfg/kedit.kcfg
@@ -800,11 +796,8 @@
%files khexedit -f khexedit.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/khexedit
-%{_libdir}/kde3/libkbyteseditwidget.la
%attr(755,root,root) %{_libdir}/kde3/libkbyteseditwidget.so
-%{_libdir}/kde3/libkhexedit2part.la
%attr(755,root,root) %{_libdir}/kde3/libkhexedit2part.so
-%{_libdir}/libkhexeditcommon.la
%attr(755,root,root) %{_libdir}/libkhexeditcommon.so.*.*.*
%{_datadir}/apps/khexedit
%{_datadir}/apps/khexedit2part
@@ -823,39 +816,29 @@
%files kmilo
%defattr(644,root,root,755)
-%{_libdir}/libkmilo.la
%attr(755,root,root) %{_libdir}/libkmilo.so.*.*.*
-%{_libdir}/kde3/kded_kmilod.la
%attr(755,root,root) %{_libdir}/kde3/kded_kmilod.so
-%{_libdir}/kde3/kmilo_generic.la
%attr(755,root,root) %{_libdir}/kde3/kmilo_generic.so
%{_datadir}/services/kded/kmilod.desktop
%dir %{_datadir}/services/kmilo
%{_datadir}/services/kmilo/kmilo_generic.desktop
%{_datadir}/servicetypes/kmilo
-%{_libdir}/kde3/kcm_kvaio.la
%attr(755,root,root) %{_libdir}/kde3/kcm_kvaio.so
-%{_libdir}/kde3/kmilo_kvaio.la
%attr(755,root,root) %{_libdir}/kde3/kmilo_kvaio.so
%{_datadir}/services/kmilo/kmilo_kvaio.desktop
%{_desktopdir}/kde/kvaio.desktop
%ifarch %{ix86} ppc
%attr(755,root,root) %{_libdir}/kde3/kmilo_powerbook.so
-%{_libdir}/kde3/kmilo_powerbook.la
%{_datadir}/services/kmilo/kmilo_powerbook.desktop
%endif
-%{_libdir}/kde3/kmilo_asus.la
%attr(755,root,root) %{_libdir}/kde3/kmilo_asus.so
-%{_libdir}/kde3/kmilo_delli8k.la
%attr(755,root,root) %{_libdir}/kde3/kmilo_delli8k.so
%{_datadir}/services/kmilo/kmilo_asus.desktop
%{_datadir}/services/kmilo/kmilo_delli8k.desktop
%files kmilo-thinkpad
%defattr(644,root,root,755)
-%{_libdir}/kde3/kcm_thinkpad.la
%attr(755,root,root) %{_libdir}/kde3/kcm_thinkpad.so
-%{_libdir}/kde3/kmilo_thinkpad.la
%attr(755,root,root) %{_libdir}/kde3/kmilo_thinkpad.so
%{_datadir}/services/kmilo/kmilo_thinkpad.desktop
%{_desktopdir}/kde/thinkpad.desktop
@@ -863,11 +846,8 @@
%files klaptopdaemon -f kcontrol.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/klaptop*
-%{_libdir}/libkcmlaptop.la
%attr(755,root,root) %{_libdir}/libkcmlaptop.so.*.*.*
-%{_libdir}/kde3/kded_klaptopdaemon.la
%attr(755,root,root) %{_libdir}/kde3/kded_klaptopdaemon.so
-%{_libdir}/kde3/kcm_laptop.la
%attr(755,root,root) %{_libdir}/kde3/kcm_laptop.so
%{_datadir}/apps/klaptopdaemon
%{_datadir}/services/kded/klaptopdaemon.desktop
@@ -878,9 +858,7 @@
%files kregexpeditor -f KRegExpEditor.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kregexpeditor
-%{_libdir}/libkregexpeditorcommon.la
%attr(755,root,root) %{_libdir}/libkregexpeditorcommon.so.*.*.*
-%{_libdir}/kde3/libkregexpeditorgui.la
%attr(755,root,root) %{_libdir}/kde3/libkregexpeditorgui.so
%{_datadir}/apps/kregexpeditor
%{_datadir}/services/kregexpeditorgui.desktop
@@ -889,9 +867,7 @@
%files ksim -f ksim.lang
%defattr(644,root,root,755)
-%{_libdir}/libksimcore.la
%attr(755,root,root) %{_libdir}/libksimcore.so.*.*.*
-%{_libdir}/kde3/ksim*.la
%attr(755,root,root) %{_libdir}/kde3/ksim*.so
%{_datadir}/apps/kicker/extensions/ksim.desktop
%{_datadir}/apps/ksim
@@ -909,7 +885,6 @@
%files kwalletmanager -f kwallet.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kwalletmanager
-%{_libdir}/kde3/kcm_kwallet.la
%attr(755,root,root) %{_libdir}/kde3/kcm_kwallet.so
%{_datadir}/apps/kwalletmanager
%{_datadir}/services/kwallet_config.desktop
@@ -934,6 +909,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.183.2.14 2008-02-14 22:53:29 glen
+- merge with HEAD
+
Revision 1.183.2.13 2008-02-14 22:50:54 glen
- convert to utf8
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdeutils.spec?r1=1.183.2.13&r2=1.183.2.14&f=u
More information about the pld-cvs-commit
mailing list