rpms/kdepim/FC-4 kdepim.spec,1.56,1.57 sources,1.29,1.30

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdepim/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv4887

Modified Files:
	kdepim.spec sources 
Log Message:
update to 3.5.2



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/kdepim.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdepim.spec	1 Feb 2006 14:53:39 -0000	1.56
+++ kdepim.spec	11 Apr 2006 20:53:21 -0000	1.57
@@ -2,17 +2,19 @@
 %define final 0
 
 %define qt_version 1:3.3.4
-%define arts_version 8:1.5.1
+%define arts_version 8:1.5.2
 
 %define arts 1
 %define make_cvs 1
 %define disable_gcc_check_and_hidden_visibility 1
-
-Version: 3.5.1
+%
+%define appdir %{_datadir}/applications/kde
+%
+Version: 3.5.2
 Release: 0.1.fc4
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
-Prefix: /usr
+Prefix: %{_prefix}
 Epoch: 6
 Group: Applications/Productivity
 License: GPL
@@ -110,10 +112,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS"
-export KDEDIR=%{prefix}
-export CFLAGS="$FLAGS "
-export CXXFLAGS="$FLAGS "
 
 cp -f %{SOURCE2} %{SOURCE3} %{SOURCE4} kandy/src
 
@@ -139,45 +137,36 @@
    --enable-final \
 %endif
    --with-qt-libraries=$QTDIR/lib \
-   --includedir=%{prefix}/include/kde
+   --includedir=%{_includedir}/kde
 
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
 # Make symlinks relative
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/doc/HTML/en/common
-pushd $RPM_BUILD_ROOT%{prefix}/share/doc/HTML/en
+mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    [ -d $i -a -L $i/common ] && (cd $i && ln -nfs ../common . && cd ..)
 done
 popd
 
-desktop-file-install \
-   --vendor "" \
-   --delete-original \
-   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/kde \
-   --add-only-show-in="KDE" \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/konsolekalendar.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/knotes.desktop \
-%ifnarch s390 s390x
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kpilotdaemon.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kpilot.desktop \
-%endif
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/KMail.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/KNode.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/Kontact.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/KOrn.desktop
+for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
+   KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
+   if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
+   fi
+done
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -205,6 +194,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4 
+- update to 3.5.2
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	1 Feb 2006 14:53:39 -0000	1.29
+++ sources	11 Apr 2006 20:53:21 -0000	1.30
@@ -1 +1 @@
-8e87c9cbe1f0c0f983f94d804a5bc8f9  kdepim-3.5.1.tar.bz2
+ac6b3b503e27a65a7b883c1e0a57262e  kdepim-3.5.2.tar.bz2