rpms/kdesdk/F-7 kdesdk.spec,1.69,1.70

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29060

Modified Files:
	kdesdk.spec 
Log Message:
sync w/rawhide branch, pull in:
- clean up /usr/share/doc/HTML/en/cervisia/common hackery (#246072)
- BR: subversion-devel neon-devel
- portability
- BR: kdepim-devel



Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-7/kdesdk.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kdesdk.spec	28 Jun 2007 13:03:33 -0000	1.69
+++ kdesdk.spec	13 Jul 2007 12:50:18 -0000	1.70
@@ -15,7 +15,7 @@
 Name:    kdesdk
 Summary: The KDE Software Development Kit (SDK)
 Version: 3.5.7
-Release: 2%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Group: User Interface/Desktops
@@ -32,14 +32,19 @@
 BuildRequires: automake libtool
 %endif
 BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+# for kbugbuster/libkcal
+BuildRequires: kdepim-devel
 BuildRequires: db4-devel
 BuildRequires: desktop-file-utils
-BuildRequires: flex >= 2.5.33-9
+# kbabel,  F-7+: flex >= 2.5.33-9
+BuildRequires: flex
+# umbrello
+BuildRequires: libxslt-devel libxml2-devel
+%if 0%{?fedora} > 5 || 0%{?rhel} > 4
 BuildRequires: binutils-devel
+%endif
 BuildRequires: perl
-BuildRequires: subversion-devel
-BuildRequires: apr-util-devel
-BuildRequires: apr-devel
+BuildRequires: subversion-devel >= 1.0, neon-devel
 
 %description
 A collection of applications and tools used by KDE developers.
@@ -112,15 +117,6 @@
 done
 popd
 
-# workaround, rpm cannot replace a directory with a symlink
-rm -f %{buildroot}%{_docdir}/HTML/en/cervisia/common
-mkdir %{buildroot}%{_docdir}/HTML/en/cervisia/common
-pushd %{buildroot}%{_docdir}/HTML/en/cervisia/common
-for i in %{_docdir}/HTML/en/common/* ; do
-   ln -s ../../common/$(basename $i) .
-done
-popd
-
 rm -f %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile \
       %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile.in
 
@@ -129,6 +125,13 @@
 rm -rf %{buildroot}
 
 
+# trick to replace a dir by a symlink -- Rex
+%pretrans
+if [ ! -L  %{_docdir}/HTML/en/cervisia/common ]; then 
+  rm -rf   %{_docdir}/HTML/en/cervisia/common
+fi
+exit 0
+
 %post
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
@@ -148,8 +151,7 @@
 
 %files
 %defattr(-,root,root)
-%exclude %{_docdir}/HTML/en/common
-%doc %{_docdir}/HTML/en/*
+%{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/kde3/*
 %{_libdir}/*.so.*
@@ -159,7 +161,9 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/applications/kde/*
 %{_datadir}/config.kcfg/*
 
@@ -173,9 +177,20 @@
 
 
 %changelog
-* Do Jun 28 2007 Than Ngo <than at redhat.com> - 3.5.7.2.fc7
+* Thu Jun 28 2007 Than Ngo <than at redhat.com> - 3.5.7-6
 - get rid of flex workaround, it's now fixed in new flex
 
+* Fri Jun 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-5
+- clean up /usr/share/doc/HTML/en/cervisia/common hackery (#246072)
+
+* Sun Jun 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-4
+- flex patch
+- BR: subversion-devel neon-devel
+- portability
+
+* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-2
+- BR: kdepim-devel
+
 * Thu Jun 14 2007 Than Ngo <than at redhat.com> -  3.5.7-1.fc7
 - 3.5.7