SPECS: kdepim.spec - Cleanups

[adgor]

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

---- Files affected:
SPECS:
   kdepim.spec (1.239 -> 1.240) 

---- Diffs:

================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.239 SPECS/kdepim.spec:1.240
--- SPECS/kdepim.spec:1.239	Wed Oct  4 00:54:14 2006
+++ SPECS/kdepim.spec	Wed Oct  4 23:51:46 2006
@@ -39,7 +39,16 @@
 %{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	ed
 BuildRequires:	flex
-%{?with_hidden_visibility:BuildRequires:	gcc-c++ >= 5:4.1.0-0.20051206r108118.1}
+%{?with_hidden_visibility:BuildRequires:	gcc-c++ >= 5:4.#
+#%{_mandir}/man1/akregator.1*
+#%{_mandir}/man1/ical2vcal.1*
+#%{_mandir}/man1/kdeopt*.1*
+#%{_mandir}/man1/kitchensync*.1*
+#%{_mandir}/man1/korga*.1*
+#%exclude %{_mandir}/man1/korganizerIn.1*
+#%{_mandir}/man1/kontact*.1*
+#%{_mandir}/man1/ksync*.1*
+#%{_mandir}/man1/*wizard.1*1.0-0.20051206r108118.1}
 BuildRequires:	gpgme-devel >= 1:1.0.0
 %{?with_apidocs:BuildRequires:	graphviz}
 BuildRequires:	kdelibs-devel >= %{_minlibsevr}
@@ -513,9 +522,6 @@
 %{__sed} -i -e '/\[Desktop Entry\]/aEncoding=UTF-8' \
 	ktnef/gui/ktnef.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
@@ -557,27 +563,11 @@
 rm -f *.lang
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	kde_htmldir=%{_kdedocdir} \
-	kde_libs_htmldir=%{_kdedocdir}
-
-# Debian manpages
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-#cd debian/man
-#if [ -f alarmd.sgml ]; then
-#	%{__sed} -i -e 's/alarmd/kalarmd/' -e 's/ALARMD/KALARMD/' alarmd.sgml
-#	mv -f alarmd.sgml kalarmd.sgml
-#fi
-#for f in *.man ; do
-#	base="$(basename $f .man)"
-#	install ${base}.man $RPM_BUILD_ROOT%{_mandir}/man1/${base}.1
-#done
-#cd -
+	kde_htmldir=%{_kdedocdir}
 
 %find_lang	akregator	--with-kde
 %find_lang	kaddressbook	--with-kde
 %find_lang	kalarm		--with-kde
-#%find_lang	kalarmd		--with-kde
-#cat kalarmd.lang >> kalarm.lang
 %find_lang	kandy		--with-kde
 %find_lang	karm		--with-kde
 %find_lang	kmail		--with-kde
@@ -600,7 +590,6 @@
 cat akregator.lang	>> %{name}.lang
 cat kontact.lang	>> %{name}.lang
 cat korganizer.lang	>> %{name}.lang
-#cat kalarmd.lang	>> %{name}.lang
 # TODO
 cat multisynk.lang	>> %{name}.lang
 
@@ -869,16 +858,6 @@
 #
 %{_iconsdir}/crystalsvg/22x22/actions/button_fewer.png
 %{_iconsdir}/crystalsvg/22x22/actions/button_more.png
-#
-#%{_mandir}/man1/akregator.1*
-#%{_mandir}/man1/ical2vcal.1*
-#%{_mandir}/man1/kdeopt*.1*
-#%{_mandir}/man1/kitchensync*.1*
-#%{_mandir}/man1/korga*.1*
-#%exclude %{_mandir}/man1/korganizerIn.1*
-#%{_mandir}/man1/kontact*.1*
-#%{_mandir}/man1/ksync*.1*
-#%{_mandir}/man1/*wizard.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -1376,6 +1355,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.240  2006/10/04 21:51:46  adgor
+- Cleanups
+
 Revision 1.239  2006/10/03 22:54:14  adgor
 - 3.5.5 .hidden
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdepim.spec?r1=1.239&r2=1.240&f=u