SPECS (DEVEL): kdebase.spec - start playing with kde4

rotom rotom at pld-linux.org
Sat Dec 16 20:56:25 CET 2006


Author: rotom                        Date: Sat Dec 16 19:56:25 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- start playing with kde4

---- Files affected:
SPECS:
   kdebase.spec (1.545 -> 1.545.4.1) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.545 SPECS/kdebase.spec:1.545.4.1
--- SPECS/kdebase.spec:1.545	Tue Nov 28 19:31:34 2006
+++ SPECS/kdebase.spec	Sat Dec 16 20:56:19 2006
@@ -14,7 +14,7 @@
 %bcond_with	kerberos5	# kerberos 5 support
 %bcond_without	hidden_visibility	# pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
 #
-%define		_state		stable
+%define		_state		unstable
 %define		_minlibsevr	9:%{version}
 
 Summary:	K Desktop Environment - core files
@@ -27,13 +27,13 @@
 Summary(uk):	K Desktop Environment - ÂÁÚĎ׌ ĆÁĘĚÉ
 Summary(zh_CN):	KDEşËĐÄ
 Name:		kdebase
-Version:	3.5.5
-Release:	4.3
+Version:	3.80.2
+Release:	0.1
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	0c685af1cbca75f9c77b3ed231ba0468
+# Source0-md5:	063e75a101191c6cf64e7514cb29fdd6
 Source1:	%{name}-kdesktop.pam
 Source2:	%{name}-kdm.pam
 Source3:	%{name}-kdm-np.pam
@@ -48,32 +48,11 @@
 Source13:	ftp://ftp.pld-linux.org/software/kde/%{name}-konqsidebartng-PLD-entries-0.1.tar.bz2
 # Source13-md5:	c8b947bc3e8a2ac050d9e9548cf585fc
 # Temporary taken from kde svn
-Patch100:	%{name}-branch.diff
-Patch0:		kde-common-PLD.patch
-Patch1:		%{name}-fontdir.patch
-Patch3:		%{name}-kdm_utmpx.patch
-Patch4:		%{name}-kdmconfig.patch
-Patch5:		%{name}-kicker.patch
-Patch7:		%{name}-nsplugins_dirs.patch
-Patch8:		%{name}-startkde.patch
-Patch9:		%{name}-kcm_fonts.patch
-Patch10:	%{name}-kdesukonsole.patch
-Patch12:	%{name}-screensavers.patch
-Patch13:	%{name}-prefmenu.patch
-Patch14:	%{name}-session.patch
-Patch16:	%{name}-vmenus.patch
-Patch18:	%{name}-kio_settings.patch
-Patch19:	%{name}-konsole-default-keytab.patch
-Patch20:	%{name}-seesar.patch
-Patch21:	%{name}-konsole-wordseps.patch
-Patch22:	%{name}-tango.patch
-Patch23:	kde-am.patch
-Patch24:	kde-ac260-lt.patch
-Patch25:	%{name}-konsole-history_clear.patch
-Patch26:	%{name}-kdm-default_background.patch
-Patch27:	kde-bug-124895.patch
 BuildRequires:	OpenEXR-devel >= 1.2.2
 BuildRequires:	OpenGL-devel
+%{?with_hidden_visibility:BuildRequires:	QtCore-devel >= 4.2.0}
+BuildRequires:	QtNetwork-devel <= 4.2.1
+BuildRequires:	QtNetwork-devel >= 4.2.0
 BuildRequires:	audiofile-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -92,6 +71,7 @@
 %{?with_kerberos5:BuildRequires: heimdal-devel}
 BuildRequires:	jasper-devel
 BuildRequires:	kdelibs-devel >= %{_minlibsevr}
+BuildRequires:	kdepimlibs-devel >= %{version}
 BuildRequires:	lame-libs-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 1.0.8
@@ -110,8 +90,7 @@
 BuildRequires:	openssl-devel >= 0.9.7c
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
-%{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
-%{?with_apidocs:BuildRequires:	qt-doc}
+%{?with_apidocs:BuildRequires:	qt4-doc}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
@@ -343,7 +322,7 @@
 Summary(pl):	Obsługa protokołu LDAP
 Group:		X11/Libraries
 Requires:	kdelibs >= %{_minlibsevr}
-Conflicts:	konqueror < 9:3.2.90.040210
+Conflicts:	konqueror < 9:3.5.5
 
 %description -n kde-kio-ldap
 KDE LDAP protocol service.
@@ -394,7 +373,7 @@
 Summary:	Default kicker sidebar
 Summary(pl):	Domyślny boczny pasek do menu KDE
 Group:		Themes
-Requires:	kdebase-desktop >= 9:3.2.90.040424-2
+Requires:	kdebase-desktop >= 9:3.5.5
 Provides:	kde-kside
 Obsoletes:	kde-kside
 
@@ -502,7 +481,7 @@
 Group:		X11/Applications
 Requires(post,postun):	fontpostinst
 Requires:	kdelibs >= %{_minlibsevr}
-Obsoletes:	kdebase < 3.0.9-2.4
+Obsoletes:	kdebase < 3.5.5
 Obsoletes:	kdebase-fonts
 
 %description common-konsole
@@ -518,7 +497,7 @@
 Requires:	kdelibs >= %{_minlibsevr}
 Requires:	sudo
 Requires:	xdg-menus
-Obsoletes:	kdebase < 8:3.2-0.030428.1
+Obsoletes:	kdebase < 8:3.5.5
 Obsoletes:	kdebase-helpcenter
 Obsoletes:	kdebase-kcontrol
 Obsoletes:	kdebase-khelpcenter
@@ -578,7 +557,7 @@
 Obsoletes:	kdebase-static
 Obsoletes:	kdebase-wallpapers
 Obsoletes:	khotkeys
-Conflicts:	kdeedu-libkdeeduui < 8:3.4.0
+Conflicts:	kdeedu-libkdeeduui < 8:3.5.5
 
 %description desktop
 KDesktop is the program that handles the desktop icons, the popup
@@ -594,7 +573,7 @@
 Group:		X11/Libraries
 Requires(post,postun):	/sbin/ldconfig
 Requires:	konqueror-libs = %{epoch}:%{version}-%{release}
-Obsoletes:	kdebase-desktop < 9:3.1.92.031006
+Obsoletes:	kdebase-desktop < 9:3.5.5
 Obsoletes:	kdebase-kicker-libs
 
 %description desktop-libs
@@ -622,7 +601,7 @@
 Summary(pl):	Narzędzie do aktualizacji menu
 Group:		X11/Applications
 Requires:	kdelibs >= %{_minlibsevr}
-Obsoletes:	kdebase =< 8:3.2-0.030418.2
+Obsoletes:	kdebase =< 8:3.5.5
 
 %description kappfinder
 The tool for finding installed application and adding them to your
@@ -698,7 +677,7 @@
 Summary(pl):	Graficzna przegladarka/klient DCOP
 Group:		X11/Applications
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
-Obsoletes:	kdebase-desktop < 9:3.1.91.030911
+Obsoletes:	kdebase-desktop < 9:3.5.5
 
 %description kdcop
 Graphic DCOP browser/client. Actually useful only for developers and
@@ -713,7 +692,7 @@
 Summary(pl):	Wersja KDE dialogu
 Group:		X11/Applications
 Requires:	kdelibs >= %{_minlibsevr}
-Obsoletes:	kdebase < 8:3.2-0.030423.2
+Obsoletes:	kdebase < 8:3.5.5
 
 %description kdialog
 Kdialog allows to display window dialogs with KDE widgets from shell
@@ -743,7 +722,7 @@
 #Requires:	konqueror = %{epoch}:%{version}-%{release}
 # for /usr/share/doc/kde/HTML/en/kcontrol, probably stupid
 Requires:	kdebase-core = %{epoch}:%{version}-%{release}
-Obsoletes:	kdebase-desktop < 3.1.90.030720
+Obsoletes:	kdebase-desktop < 3.5.5
 
 %description kfontinst
 KDE font installer.
@@ -796,7 +775,7 @@
 Summary(pl):	Przełącznik biurek
 Group:		X11/Applications
 Requires:	kdelibs >= %{_minlibsevr}
-Obsoletes:	kdebase =< 8:3.2-0.030418.2
+Obsoletes:	kdebase =< 8:3.5.5
 
 %description kpager
 KDE Desktop Pager.
@@ -810,7 +789,7 @@
 Group:		X11/Applications
 Requires:	%{name}-desktop = %{epoch}:%{version}-%{release}
 Requires:	%{name}-klipper = %{epoch}:%{version}-%{release}
-Obsoletes:	kdebase < 9:3.1.92.031021
+Obsoletes:	kdebase < 9:3.5.5
 
 %description kpersonalizer
 KDE desktop settings wizard.
@@ -856,7 +835,7 @@
 Group:		X11/Applications
 # With functional reasons
 Requires:	kdebase-core = %{epoch}:%{version}-%{release}
-Obsoletes:	kdebase < 8:3.2-0.030423.1
+Obsoletes:	kdebase < 8:3.5.5
 
 %description kwrited
 A kde daeomn that watches for messages from local users sent with
@@ -872,7 +851,7 @@
 Group:		X11/Libraries
 Requires(post,postun):	/sbin/ldconfig
 Requires:	kdelibs >= %{_minlibsevr}
-Obsoletes:	kdebase-kate < 8:3.2-0.030423.1
+Obsoletes:	kdebase-kate < 8:3.5.5
 Obsoletes:	kdebase-libkmultitabbar
 
 %description libkate
@@ -890,7 +869,7 @@
 Requires(post,postun):	/sbin/ldconfig
 Requires:	kdelibs >= %{_minlibsevr}
 Obsoletes:	kdebase-ksysguard-libs
-Obsoletes:	ksysguard < 9:3.1.92.031012
+Obsoletes:	ksysguard < 9:3.5.5
 
 %description libksgrd
 A library containing functions for the system monitor KSysGuard.
@@ -1015,7 +994,7 @@
 Obsoletes:	kdebase-libkickermain
 Obsoletes:	kdebase-libkonq
 Obsoletes:	kdebase-libkonqsidebarplugin
-Obsoletes:	konqueror < 9:3.1.92.031006
+Obsoletes:	konqueror < 9:3.5.5
 
 %description -n konqueror-libs
 Konqueror shared libraries.
@@ -1027,7 +1006,7 @@
 Summary:	API documentation
 Summary(pl):	Dokumentacja API
 Group:		Documentation
-Requires:	kdelibs >= 9:3.2.90
+Requires:	kdelibs >= 9:3.5.5
 
 %description apidocs
 Annotated reference of konqueror,kate,kicker,kcontrol and other
@@ -1044,41 +1023,14 @@
 
 %prep
 %setup -q
-%patch100 -p0
-%patch0 -p1
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch7 -p1
-%patch8 -p1
-# Outdated but some things
-# must be revised (AA default settings)
-#%patch9 -p1
-%patch10 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch16 -p1
-%patch18 -p1
-# FIXME (still needed?)
-#%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p0
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p0
-
-cd kcontrol/ebrowsing/plugins/ikws/searchproviders
-for i in  google*.desktop
-do
-	url=`grep 'Query=' $i|sed -e 's,google.com,google.pl,g'|cut -c 7-`
-	echo "Query[pl]=${url}" >> $i
-done
-cd -
+
+#cd kcontrol/ebrowsing/plugins/ikws/searchproviders
+#for i in  google*.desktop
+#do
+#	url=`grep 'Query=' $i|sed -e 's,google.com,google.pl,g'|cut -c 7-`
+#	echo "Query[pl]=${url}" >> $i
+#done
+#cd -
 
 %{__sed} -i -e 's/Categories=.*/Categories=Audio;Mixer;/' \
 	kappfinder/apps/Multimedia/alsamixergui.desktop
@@ -1088,86 +1040,58 @@
 	kappfinder/apps/Multimedia/audacity.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Office;PDA;/' \
 	kappfinder/apps/Utilities/xgnokii.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;TerminalEmulator;/' \
-	konsole/konsole-script.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;TerminalEmulator;/' \
-	konsole/konsole.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Amusement;/' \
-	ksplashml/ksplash.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;System;Monitor;/' \
-	ksysguard/gui/ksysguard.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Settings;/' \
-	kcontrol/kcontrol/KControl.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;X-KDE-settings-desktop;/' \
-	kcontrol/konq/desktoppath.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;TrayIcon;/' \
-	kcontrol/randr/krandrtray.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;X-Help;/' \
-	-e 's/Name=/Name=KDE/g' -e s'/Name[pl]=Pomoc/Name[pl]=Pomoc KDE/g' \
-	-e 's/OnlyShowIn=KDE;//g' khelpcenter/Help.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;/' \
-	-e 's/OnlyShowIn=KDE;//g' kfind/Kfind.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;SystemSetup;/' \
-	konqueror/konquerorsu.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;SystemSetup;/' \
-	konsole/konsolesu.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Network;WebBrowser;/' \
-	konqueror/konqbrowser.desktop
-%{__sed} -i -e 's/\(^Categories=.*$\)/\1;/' kioslave/media/kcmodule/media.desktop
+#%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;TerminalEmulator;/' \
+#	konsole/konsole-script.desktop
+#%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;TerminalEmulator;/' \
+#	konsole/konsole.desktop
+#%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Amusement;/' \
+#	ksplashml/ksplash.desktop
+#%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;System;Monitor;/' \
+#	ksysguard/gui/ksysguard.desktop
+#%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Settings;/' \
+#	kcontrol/kcontrol/KControl.desktop
+#%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;X-KDE-settings-desktop;/' \
+#	kcontrol/konq/desktoppath.desktop
+#%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;TrayIcon;/' \
+#	kcontrol/randr/krandrtray.desktop
+#%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;X-Help;/' \
+#	-e 's/Name=/Name=KDE/g' -e s'/Name[pl]=Pomoc/Name[pl]=Pomoc KDE/g' \
+#	-e 's/OnlyShowIn=KDE;//g' khelpcenter/Help.desktop
+#%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;/' \
+#	-e 's/OnlyShowIn=KDE;//g' kfind/Kfind.desktop
+#%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;SystemSetup;/' \
+#	konqueror/konquerorsu.desktop
+#%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;SystemSetup;/' \
+#	konsole/konsolesu.desktop
+#%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Network;WebBrowser;/' \
+#	konqueror/konqbrowser.desktop
+#%{__sed} -i -e 's/\(^Categories=.*$\)/\1;/' kioslave/media/kcmodule/media.desktop
 for f in `find . -name \*.desktop`; do
 	if grep -q '\[ven\]' $f; then
 		sed -i -e 's/\[ven\]/[ve]/' $f
 	fi
 done
 
-cp /usr/share/automake/config.sub admin
-%{__make} -f admin/Makefile.common cvs
-
-%{__sed} -i -e 's#krb5/##g' configure* */configure* */*.c */*/*.c
-
 %build
-%if %{with apidocs}
-	if [ ! -f "%{_kdedocdir}/en/common/kde-common.css" ]; then
-		echo "ERROR: Building kdebase with apidocs requires kdelibs"
-		echo "	   to be installed _without_ excluding documentation."
-		exit 1
-	fi
-%endif
-
-%configure \
-	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
-	%{!?debug:--disable-rpath} \
-	--disable-final \
-	%{?with_hidden_visibility:--enable-gcc-hidden-visibility} \
-%if "%{_lib}" == "lib64"
-	--enable-libsuffix=64 \
-%endif
-	--with-distribution="PLD Linux Distribution" \
-	--with-kdm-pam=kdm \
-	--with-pam=kdesktop \
-	--with-openexr \
-	--with-qt-libraries=%{_libdir} \
-	--with%{!?with_kerberos5:out}-krb5auth \
-	--without-java \
-	%{!?with_ldap:--without-ldap}
-
-
+export QTDIR=%{_prefix}
+mkdir build
+cd build
+%cmake \
+-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	../
 
 %{__make}
 
-%{?with_apidocs:%{__make} apidox}
-
 %install
 rm -rf $RPM_BUILD_ROOT
-rm -rf *.lang
 
-%{__make} install \
+%{__make} -C build/ install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	kde_htmldir=%{_kdedocdir}
 
 install -d \
 	$RPM_BUILD_ROOT/etc/{X11/kdm/faces,pam.d,rc.d/init.d,security} \
-	$RPM_BUILD_ROOT%{_libdir}/kde3/plugins/konqueror \
+	$RPM_BUILD_ROOT%{_libdir}/kde4/plugins/konqueror \
 	$RPM_BUILD_ROOT%{_datadir}/apps/kate/{scripts,plugins}
 
 if [ -d "$RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs" ] ; then
@@ -1211,108 +1135,6 @@
 done
 cd -
 
-# find_lang
-> core.lang
-programs=" \
-	colors \
-	fonts \
-	kcmstyle \
-	kdebugdialog \
-	kdeprint \
-	kdesu \
-	khelpcenter \
-	knetattach \
-	kompmgr \
-	language"
-
-for i in $programs; do
-	%find_lang $i --with-kde
-	cat $i.lang >> core.lang
-done
-
-> %{name}.lang
-programs=" \
-	arts \
-	background \
-	bell \
-	clock \
-	desktop \
-	desktopbehavior \
-	energy \
-	kcmaccess \
-	kcmlaunch \
-	kcmnotify \
-	kcmsmserver \
-	kcmtaskbar \
-	keyboard \
-	keys \
-	kicker \
-	kmenuedit \
-	ksplashml \
-	kwindecoration \
-	kxkb \
-	mouse \
-	panel \
-	panelappearance \
-	passwords \
-	performance \
-	spellchecking \
-	windowmanagement"
-
-for i in $programs; do
-	%find_lang $i --with-kde
-	cat $i.lang >> %{name}.lang
-done
-
-%find_lang konqueror	--with-kde
-programs="\
-	cache \
-	cookies \
-	crypto \
-	ebrowsing \
-	email \
-	filemanager \
-	filetypes \
-	icons \
-	kcmcss \
-	khtml \
-	netpref \
-	proxy \
-	smb \
-	useragent"
-
-for i in $programs; do
-	%find_lang $i --with-kde
-	cat $i.lang >> konqueror.lang
-done
-
-%find_lang kappfinder	--with-kde
-%find_lang kate		--with-kde
-%find_lang kcmkonsole	--with-kde
-%find_lang kdm		--with-kde
-%find_lang kfind	--with-kde
-%find_lang kcmfontinst	--with-kde
-%find_lang kdcop	--with-kde
-%find_lang kinfocenter	--with-kde
-%find_lang kioslave	--with-kde
-%find_lang klipper	--with-kde
-%find_lang konsole	--with-kde
-%find_lang ksysguard	--with-kde
-%find_lang kpager	--with-kde
-%find_lang kwrite	--with-kde
-%find_lang screensaver	--with-kde
-
-cat kcmkonsole.lang	>> konsole.lang
-cat kioslave.lang	>> kinfocenter.lang
-
-# Omit apidocs entries
-sed -i 's/.*apidocs.*//' *.lang
-
-if [ -d "$RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs" ] ; then
-	mv -f $RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-{%{version}-,}apidocs
-fi
-
-rm -f $RPM_BUILD_ROOT/etc/X11/kdm/README
 rm -f $RPM_BUILD_ROOT%{_docdir}/kdm/README
 rm -f $RPM_BUILD_ROOT%{_desktopdir}/kde/kcmkicker.desktop # see r1.328
 rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/keditbookmarks.desktop
@@ -1368,10 +1190,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post common-konsole
-/usr/bin/fontpostinst misc
+%{_bindir}/fontpostinst misc
 
 %postun common-konsole
-/usr/bin/fontpostinst misc
+%{_bindir}/fontpostinst misc
 
 %post core -p /sbin/ldconfig
 %postun core -p /sbin/ldconfig
@@ -1425,114 +1247,101 @@
 %{_includedir}/kate
 %{_includedir}/ksgrd
 %{_includedir}/ksplash
-%{_includedir}/kwin
-%{_libdir}/libkasbar.so
-%{_libdir}/libkateinterfaces.so
-%{_libdir}/libkateutils.so
-%{_libdir}/libkdecorations.so
-%{_libdir}/libkfontinst.so
-%{_libdir}/libkickermain.so
-%{_libdir}/libkonq.so
-%{_libdir}/libkonqsidebarplugin.so
-%{_libdir}/libksgrd.so
-%{_libdir}/libksplashthemes.so
-#%{_libdir}/libsensordisplays.so
-%{_libdir}/libtaskbar.so
-%{_libdir}/libtaskmanager.so
+%{_datadir}/apps/cmake
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_kdedocdir}/en/%{name}-apidocs
+#%{_kdedocdir}/en/%{name}-apidocs
 %endif
 
 %files -n kde-decoration-b2
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin3_b2.la
-%attr(755,root,root) %{_libdir}/kde3/kwin3_b2.so
-%{_libdir}/kde3/kwin_b2_config.la
-%attr(755,root,root) %{_libdir}/kde3/kwin_b2_config.so
+%{_libdir}/kde4/kwin3_b2.la
+%attr(755,root,root) %{_libdir}/kde4/kwin3_b2.so
+%{_libdir}/kde4/kwin_b2_config.la
+%attr(755,root,root) %{_libdir}/kde4/kwin_b2_config.so
 %{_datadir}/apps/kwin/b2.desktop
 
 %files -n kde-decoration-keramik
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin3_keramik.la
-%attr(755,root,root) %{_libdir}/kde3/kwin3_keramik.so
-%{_libdir}/kde3/kwin_keramik_config.la
-%attr(755,root,root) %{_libdir}/kde3/kwin_keramik_config.so
+%{_libdir}/kde4/kwin3_keramik.la
+%attr(755,root,root) %{_libdir}/kde4/kwin3_keramik.so
+%{_libdir}/kde4/kwin_keramik_config.la
+%attr(755,root,root) %{_libdir}/kde4/kwin_keramik_config.so
 %{_datadir}/apps/kwin/keramik.desktop
 
 %files -n kde-decoration-laptop
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin3_laptop.la
-%attr(755,root,root) %{_libdir}/kde3/kwin3_laptop.so
+%{_libdir}/kde4/kwin3_laptop.la
+%attr(755,root,root) %{_libdir}/kde4/kwin3_laptop.so
 %{_datadir}/apps/kwin/laptop.desktop
 
 %files -n kde-decoration-modernsys
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin3_modernsys.la
-%attr(755,root,root) %{_libdir}/kde3/kwin3_modernsys.so
-%{_libdir}/kde3/kwin_modernsys_config.la
-%attr(755,root,root) %{_libdir}/kde3/kwin_modernsys_config.so
+%{_libdir}/kde4/kwin3_modernsys.la
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.545&r2=1.545.4.1&f=u



More information about the pld-cvs-commit mailing list