rpms/kdesdk/devel kdesdk.spec, 1.66, 1.67 kdesdk-3.5.7-flex.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdesdk.spec 
Removed Files:
	kdesdk-3.5.7-flex.patch 
Log Message:
* 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)




Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kdesdk.spec	17 Jun 2007 22:15:47 -0000	1.66
+++ kdesdk.spec	13 Jul 2007 12:43:14 -0000	1.67
@@ -15,7 +15,7 @@
 Name:    kdesdk
 Summary: The KDE Software Development Kit (SDK)
 Version: 3.5.7
-Release: 4%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Group: User Interface/Desktops
@@ -24,8 +24,6 @@
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kdesdk-3.4.0-db4.patch
 Patch2: kdesdk-3.5.4-multilib.patch
-# flex workaround 
-Patch3: kdesdk-3.5.7-flex.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -38,7 +36,7 @@
 BuildRequires: kdepim-devel
 BuildRequires: db4-devel
 BuildRequires: desktop-file-utils
-# kbabel
+# kbabel,  F-7+: flex >= 2.5.33-9
 BuildRequires: flex
 # umbrello
 BuildRequires: libxslt-devel libxml2-devel
@@ -69,7 +67,6 @@
 
 %patch1 -p1 -b .db4
 %patch2 -p1 -b .multilib
-%patch3 -p1 -b .flex
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -120,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
 
@@ -137,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
@@ -156,8 +151,7 @@
 
 %files
 %defattr(-,root,root)
-%exclude %{_docdir}/HTML/en/common
-%doc %{_docdir}/HTML/en/*
+%{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/kde3/*
 %{_libdir}/*.so.*
@@ -167,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/*
 
@@ -181,6 +177,12 @@
 
 
 %changelog
+* 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


--- kdesdk-3.5.7-flex.patch DELETED ---