rpms/kdepim/devel kdepim.spec,1.130,1.131

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27028

Modified Files:
	kdepim.spec 
Log Message:
* Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
- drop OnlyShowIn=KDE munging
- update %description
- tidy up



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kdepim.spec	30 Aug 2007 01:57:27 -0000	1.130
+++ kdepim.spec	12 Sep 2007 15:47:56 -0000	1.131
@@ -1,18 +1,18 @@
+
 %define debug 0
+# --enable-final requires > 1GB VM, sometimes kills our builders 
 %define final 0
 
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
 %define make_cvs 1
 
 %define _with_gnokii --with-gnokii
 %define _with_mal --with-mal
 
 Name:    kdepim
-Summary: PIM (Personal Information Manager) for KDE
+Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 3.5.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -70,7 +70,9 @@
 BuildRequires: automake libtool
 %endif
 
-Obsoletes: akregator < 0:1.0
+%define akregator_ver 1.2.7
+Obsoletes: akregator < 0:%{akregator_ver}-%{release}
+#Provides: akregator = 0:%{akregator_ver}-%{release} 
 
 ##Optional bits
 Requires(hint): pinentry-gui
@@ -84,7 +86,14 @@
 %endif
 
 %description
-A PIM (Personal Information Manager) for KDE.
+%{summary}, including:
+* akregator: feed aggregator 
+* kmail: email client
+* knode: newsreader
+* knotes: sticky notes for the desktop
+* kontact: integrated PIM management
+* korganizer: journal, appointments, events, todos
+%{?_with_pilot_link:* kpilot: HotSync® software for Palm OS® devices}
 
 %package devel
 Summary: Development files for %{name} 
@@ -113,7 +122,7 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-cp -f %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src
+install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -145,24 +154,30 @@
 %install
 rm -rf %{buildroot} 
 
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
 
-# Make symlinks relative
-mkdir -p %{buildroot}%{prefix}/share/doc/HTML/en/common
-pushd %{buildroot}%{prefix}/share/doc/HTML/en
+# make symlinks relative
+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 ..)
+   if [ -d $i -a -L $i/common ]; then
+      rm -f $i/common
+      ln -nfs ../common $i
+   fi
 done
 popd
 
+
 ## FIXME.  *ALL* of these?  Surely, non-kde users should get to see
 ## some of these gems.  -- Rex
+%if 0
 for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
    KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
    if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
       echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
    fi
 done
+%endif
 
 ## remove references to extraneous/optional libraries in .la files (#170602)
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
@@ -232,6 +247,11 @@
 
 
 %changelog
+* Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
+- drop OnlyShowIn=KDE munging
+- update %%description
+- tidy up
+
 * Mon Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-7
 - templates for forwarding do not work with inline mails (kde#140549)