Author: adgor                        Date: Wed Oct  4 22:09:21 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Cleanups

---- Files affected:
SPECS:
   kdeutils.spec (1.179 -> 1.180) 

---- Diffs:

================================================================
Index: SPECS/kdeutils.spec
diff -u SPECS/kdeutils.spec:1.179 SPECS/kdeutils.spec:1.180
--- SPECS/kdeutils.spec:1.179   Wed Oct  4 19:54:34 2006
+++ SPECS/kdeutils.spec Thu Oct  5 00:09:15 2006
@@ -561,36 +561,20 @@
 %{__sed} -i -e 's#/copy.py#/copy.pyc#g' admin/acinclude.m4.in
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;Archiving;/' \
-       -e 's/Terminal=0/Terminal=false/' \
        ark/ark.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;Applet;/' \
+       -e 's/Terminal=0/Terminal=false/' \
        kdelirc/irkick/irkick.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;Calculator;/' \
-       -e 's/Terminal=0/Terminal=false/' \
        kcalc/kcalc.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;TextEditor;X-HexEditor;/' \
-       -e 's/Terminal=0/Terminal=false/' \
        khexedit/khexedit.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;System;Monitor;/' \
        -e '/\[Desktop Entry\]/aEncoding=UTF-8' \
        ksim/ksim.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;Applet;/' \
        kdf/kwikdisk.desktop
-%{__sed} -i -e 's/Terminal=0/Terminal=false/' \
-       kcharselect/KCharSelect.desktop \
-       kdf/kdf.desktop \
-       kdf/kwikdisk.desktop \
-       kedit/KEdit.desktop \
-       kfloppy/KFloppy.desktop \
-       khexedit/khexedit.desktop \
-       kjots/Kjots.desktop \
-       kregexpeditor/kregexpeditor.desktop \
-       ktimer/ktimer.desktop \
-       kwallet/kwalletmanager.desktop
 for f in `find . -name \*.desktop`; do
-       if grep -q '^Categories=.*[^;]$' $f; then
-               sed -i -e 's/\(^Categories=.*$\)/\1;/' $f
-       fi
        if grep -q '\[ven\]' $f; then
                sed -i -e 's/\[ven\]/[ve]/' $f
        fi
@@ -599,10 +583,6 @@
 %build
 cp /usr/share/automake/config.sub admin
 
-#echo "KDE_OPTIONS = nofinal" >> ksim/monitors/snmp/Makefile.am
-
-%{__make} -f admin/Makefile.common cvs
-
 %configure \
        --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
        %{!?debug:--disable-rpath} \
@@ -632,13 +612,11 @@
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       kde_htmldir=%{_kdedocdir} \
-       kde_libs_htmldir=%{_kdedocdir}
+       kde_htmldir=%{_kdedocdir}
 
 %{__make} -C ksim/monitors/i8k install \
        DESTDIR=$RPM_BUILD_ROOT \
-       kde_htmldir=%{_kdedocdir} \
-       kde_libs_htmldir=%{_kdedocdir}
+       kde_htmldir=%{_kdedocdir}
 
 mv $RPM_BUILD_ROOT%{_desktopdir}/kde/kwallet{config,}.desktop
 mv $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/superkaramba.desktop \
@@ -947,6 +925,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.180  2006/10/04 22:09:15  adgor
+- Cleanups
+
 Revision 1.179  2006/10/04 17:54:34  arekm
 - apply kde-ac260-lt.patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdeutils.spec?r1=1.179&r2=1.180&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to