Author: glen Date: Fri Feb 15 12:56:13 2008 GMT Module: SPECS Tag: AC-branch ---- Log message: - KDE 3.5.9, install shortcuts
---- Files affected: SPECS: kdeutils.spec (1.183.2.14 -> 1.183.2.15) ---- Diffs: ================================================================ Index: SPECS/kdeutils.spec diff -u SPECS/kdeutils.spec:1.183.2.14 SPECS/kdeutils.spec:1.183.2.15 --- SPECS/kdeutils.spec:1.183.2.14 Thu Feb 14 23:53:29 2008 +++ SPECS/kdeutils.spec Fri Feb 15 13:56:08 2008 @@ -1,4 +1,15 @@ # $Revision$, $Date$ +# TODO +# - unpackaged +# /usr/lib/libkcmlaptop.so.0 +# /usr/lib/libkdeinit_ark.la +# /usr/lib/libkdeinit_irkick.la +# /usr/lib/libkdeinit_kcalc.la +# /usr/lib/libkdeinit_kedit.la +# /usr/lib/libkhexeditcommon.so.0 +# /usr/lib/libkmilo.so.1 +# /usr/lib/libkregexpeditorcommon.so.1 +# /usr/lib/libksimcore.so.1 # # Conditional build: %bcond_without xmms # do not force xmms support @@ -17,13 +28,13 @@ Summary(uk.UTF-8): K Desktop Environment - Утиліти Summary(zh_CN.UTF-8): KDE实用工具 Name: kdeutils -Version: 3.5.8 -Release: 2 +Version: 3.5.9 +Release: 0.1 Epoch: 9 License: GPL Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: d1a0fcc83f35428a76cf7523a04ba19c +# Source0-md5: dbe5ddff57141f27778601df5571e182 #Patch100: %{name}-branch.diff Patch0: kde-common-PLD.patch Patch1: kde-ac260-lt.patch @@ -45,9 +56,9 @@ BuildRequires: python-devel BuildRequires: python-modules %{?with_hidden_visibility:BuildRequires: qt-devel >= 6:3.3.5.051113-1} +BuildRequires: rpmbuild(find_lang) >= 1.32 BuildRequires: rpmbuild(macros) >= 1.129 BuildRequires: sed >= 4.0 -#BuildRequires: unsermake >= 040511 %{?with_xmms:BuildRequires: xmms-devel} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -614,28 +625,32 @@ %{__make} -C ksim/monitors/i8k %install -rm -rf $RPM_BUILD_ROOT -rm -f *.lang - -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - kde_htmldir=%{_kdedocdir} - -%{__make} -C ksim/monitors/i8k install \ - DESTDIR=$RPM_BUILD_ROOT \ - kde_htmldir=%{_kdedocdir} - -install -d $RPM_BUILD_ROOT%{_datadir}/themes/superkaramba -mv $RPM_BUILD_ROOT%{_desktopdir}/kde/kwallet{config,}.desktop -mv $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/superkaramba.desktop \ - $RPM_BUILD_ROOT%{_desktopdir}/kde - -# unsupported -rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/locolor - -# drop la files -rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la +if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then + rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT + %{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ + kde_htmldir=%{_kdedocdir} + + %{__make} -C ksim/monitors/i8k install \ + DESTDIR=$RPM_BUILD_ROOT \ + kde_htmldir=%{_kdedocdir} + touch makeinstall.stamp +fi + +if [ ! -f installed.stamp ]; then + install -d $RPM_BUILD_ROOT%{_datadir}/themes/superkaramba + mv $RPM_BUILD_ROOT%{_desktopdir}/kde/kwallet{config,}.desktop + mv $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/superkaramba.desktop \ + $RPM_BUILD_ROOT%{_desktopdir}/kde + + # unsupported + rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/locolor + + # drop la files + rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la +fi +rm -f *.lang %find_lang ark --with-kde %find_lang irkick --with-kde %find_lang KRegExpEditor --with-kde @@ -643,10 +658,8 @@ %find_lang kcharselect --with-kde %find_lang kcontrol --with-kde %find_lang kdf --with-kde -%find_lang blockdevices --with-kde -cat blockdevices.lang >> kdf.lang -%find_lang kcmlirc --with-kde -cat kcmlirc.lang >> irkick.lang +%find_lang kinfocenter/blockdevices --with-kde -a kdf.lang +%find_lang kcmlirc --with-kde -a irkick.lang %find_lang kedit --with-kde %find_lang kfloppy --with-kde %find_lang kgpg --with-kde @@ -658,8 +671,8 @@ %find_lang superkaramba --with-kde # Omit bogus apidocs entries. -# Otherwise 'kdeutils-apidocs` owner is needed -sed -i 's/.*apidocs.*//' *.lang +# Otherwise 'kdeutils-apidocs' owner is needed +%{__sed} -i -e '/apidocs/d' *.lang %clean rm -rf $RPM_BUILD_ROOT @@ -909,6 +922,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.183.2.15 2008-02-15 12:56:08 glen +- KDE 3.5.9, install shortcuts + Revision 1.183.2.14 2008-02-14 22:53:29 glen - merge with HEAD ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdeutils.spec?r1=1.183.2.14&r2=1.183.2.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
