packages: kde4-kde3support/kde4-kde3support.spec - plik /usr/bin/preparetip...

[shadzik]

Author: shadzik                      Date: Sun Dec 20 12:49:50 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- plik /usr/bin/preparetips z instalacji kde4-kdelibs-4.3.85-1.x86_64 jest w konflikcie z plikiem z pakietu kde4-kde3support-3.5.10-15.x86_64

---- Files affected:
packages/kde4-kde3support:
   kde4-kde3support.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: packages/kde4-kde3support/kde4-kde3support.spec
diff -u packages/kde4-kde3support/kde4-kde3support.spec:1.34 packages/kde4-kde3support/kde4-kde3support.spec:1.35
--- packages/kde4-kde3support/kde4-kde3support.spec:1.34	Wed Dec 16 10:42:35 2009
+++ packages/kde4-kde3support/kde4-kde3support.spec	Sun Dec 20 13:49:44 2009
@@ -315,6 +315,8 @@
 	# remove meinproc binary and link to meinproc4 which works
 	rm -f $RPM_BUILD_ROOT%{_bindir}/meinproc
 	ln -s %{_bindir}/meinproc4 $RPM_BUILD_ROOT%{_bindir}/meinproc
+	
+	rm -f $RPM_BUILD_ROOT%{_bindir}/preparetips
 
 	# remove unwanted boost deps from .la
 	sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kdewidgets.la
@@ -397,7 +399,8 @@
 %attr(755,root,root) %{_bindir}/make_driver_db_lpr
 # use link to meinproc4
 %attr(755,root,root) %{_bindir}/meinproc
-%attr(755,root,root) %{_bindir}/preparetips
+# use preparetips from kde 4.4
+#%attr(755,root,root) %{_bindir}/preparetips
 %attr(4755,root,root) %{_bindir}/start_kdeinit
 %attr(755,root,root) %{_bindir}/start_kdeinit_wrapper
 
@@ -759,6 +762,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2009/12/20 12:49:44  shadzik
+- plik /usr/bin/preparetips z instalacji kde4-kdelibs-4.3.85-1.x86_64 jest w konflikcie z plikiem z pakietu kde4-kde3support-3.5.10-15.x86_64
+
 Revision 1.34  2009/12/16 09:42:35  arekm
 O: kde4-icons-crystalsvg
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kde3support/kde4-kde3support.spec?r1=1.34&r2=1.35&f=u