packages: kde4-kde3support/kde4-kde3support.spec - link meinproc to meinpro...

[shadzik]

Author: shadzik                      Date: Fri Nov 27 18:08:37 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- link meinproc to meinproc4
- Suggests: kde4-kdelibs
- clean up *.la files
- rel 15

---- Files affected:
packages/kde4-kde3support:
   kde4-kde3support.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: packages/kde4-kde3support/kde4-kde3support.spec
diff -u packages/kde4-kde3support/kde4-kde3support.spec:1.28 packages/kde4-kde3support/kde4-kde3support.spec:1.29
--- packages/kde4-kde3support/kde4-kde3support.spec:1.28	Mon Nov 23 17:03:56 2009
+++ packages/kde4-kde3support/kde4-kde3support.spec	Fri Nov 27 19:08:31 2009
@@ -19,7 +19,7 @@
 Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
 Name:		kde4-kde3support
 Version:	3.5.10
-Release:	14
+Release:	15
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{origname}-%{version}.tar.bz2
@@ -102,6 +102,9 @@
 Requires:	setup >= 2.4.6-7
 Requires:	xorg-app-iceauth
 Obsoletes:	kdelibs
+# for meinproc4 - it's not Requeres on purpose 
+# not everyone needs meinproc4 and not everyone want's kde4 while having kde3 apps
+Suggests:	kde4-kdelibs
 Conflicts:	sim < 0.9.3-4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -305,9 +308,14 @@
 	install -d $RPM_BUILD_ROOT%{_iconsdir}/crystalsvg
 	cp -a crystal_project/*/ $RPM_BUILD_ROOT%{_iconsdir}/crystalsvg
 
+	# 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
+
 	# remove unwanted boost deps from .la
 	sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kdewidgets.la
 	sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/*.la
+	rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 	touch installed.stamp
 fi
@@ -383,6 +391,7 @@
 %attr(755,root,root) %{_bindir}/lnusertemp
 %attr(755,root,root) %{_bindir}/make_driver_db_cups
 %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
 %attr(4755,root,root) %{_bindir}/start_kdeinit
@@ -748,6 +757,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2009/11/27 18:08:31  shadzik
+- link meinproc to meinproc4
+- Suggests: kde4-kdelibs
+- clean up *.la files
+- rel 15
+
 Revision 1.28  2009/11/23 16:03:56  shadzik
 - rel 13 was unfortunate
 - rel 14 fixes dirs problem
================================================================

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