Browse Source

updated: KDE 3 stuffs

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@636 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 14 years ago
parent
commit
4f6e4e2d86

+ 646 - 12
k/kde-i18n-ja/kde-i18n-ja-vl.spec

@@ -2,14 +2,14 @@
 %define srcdir ftp://ftp.kde.org/pub/kde/snapshots/current
 
 Name: kde-i18n-ja
-Version: 3.5.8
+Version: 3.5.10
 %if %{beta}
 Release: 1.%{beta}%{?_dist_release}
 %else
 Release: 1%{?_dist_release}
 %endif
 Summary: K Desktop Environment - Japanese Messages
-Summary(ja): Kデスクトップ環境 - 日本語メッセージ
+Summary(ja): Kデスクトップ環境 3 - 日本語メッセージ
 %if %{beta}
 Source: ftp://ftp.kde.org/pub/kde/unstable/%{version}-%{beta}/src/kde-i18n/%{name}-%{version}-%{beta}.tar.bz2
 %else
@@ -20,10 +20,10 @@ URL: http://www.kde.gr.jp/
 Group: User Interface/Desktops
 License: GPL/LGPL
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
-Requires: kdelibs
-BuildRequires: kdelibs-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: kdelibs3-devel
+Requires: kdelibs3
 
 %description
 KDE helps and messages for Japanese.
@@ -35,18 +35,649 @@ KDE3用の日本語メッセージ。
 %setup -q
 
 %build
-export KDEDIR=%{_prefix}
-env CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=$KDEDIR
+%configure 
 make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export KDEDIR=%{_prefix}
-mkdir -p $RPM_BUILD_ROOT$KDEDIR
-
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} install
+
+# remove zero-length file
+for i in $(find $RPM_BUILD_ROOT%{_docdir}/HTML -size 0) ; do
+   rm -f $i
+done
+
+# See http://fedoraproject.org/wiki/Languages
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/flag.png
+
+# remove .mo and entry.desktop files which conflict with KDE 4 kde-l10n
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/amor.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ark.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/audiocd_encoder_lame.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/audiocd_encoder_vorbis.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/audiorename_plugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/blinken.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/bovo.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/cervisia.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/cvsservice.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/display.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/dolphin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/drkonqi.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/filetypes.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/gwenview.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/htmlsearch.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/imagerename_plugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/irkick.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/joystick.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/juk.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_dir.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_file.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_ldapkio.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_net.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabcformat_binary.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kaccess.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kalgebra.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kalzium.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kanagram.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kappfinder.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kate.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kateexternaltoolsplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katefilebrowserplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katefiletemplates.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katefindinfilesplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katehelloworld.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katehtmltools.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kateinsertcommand.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katekjswrapper.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katekonsoleplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katemailfilesplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katemake.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kateopenheader.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katepart4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katepybrowse.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katequickdocumentswitcherplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katesnippets.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katesymbolviewer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katetabbarextension.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katetextfilter.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katexmlcheck.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katexmltools.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katomic.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbattleship.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kblackbox.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kblankscrn.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbounce.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbruch.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbstateapplet.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbugbuster.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcachegrind.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcalc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcertpart.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcharselect.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcharselectapplet.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_krfb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_kwindesktop.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_phonon.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_phononxine.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_solid.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmaccess.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmaccessibility.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmaudiocd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmbackground.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmbell.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcddb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcgi.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcolors.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcomponentchooser.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcrypto.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcss.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmenergy.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmfonts.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmhtmlsearch.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmicons.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcminfo.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcminit.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcminput.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmioslaveinfo.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkamera.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkclock.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkded.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkdnssd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkeyboard.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkeys.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkio.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkonq.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkonqhtml.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkurifilt.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkvaio.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwallet.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwincompositing.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwindecoration.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwinrules.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwm.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlaunch.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlirc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlocale.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmnic.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmnotify.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmperformance.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmsamba.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmscreensaver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmshell.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmsmartcard.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmsmserver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmstyle.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmtaskbar.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmthinkpad.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmusb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmview1394.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmxinerama.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcolorchooser.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcron.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdat.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kde-menu.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdebugdialog.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdelibs4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdelibs_colors4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdelirc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepasswd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdeqt.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdessh.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdesu.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdesud.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdf.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdialog.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdmconfig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdmgreet.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/keditbookmarks.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfifteenapplet.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_avi.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_dds.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_drgeo.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_dvi.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_exr.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_flac.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_kig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_mp3.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_mpc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_mpeg.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_ogg.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_pnm.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_raw.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_rgb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_rpm.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_sid.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_theora.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_tiff.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_torrent.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_wav.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_xps.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfileaudiopreview4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfileshare.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfindpart.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfloppy.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfmclient.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfontinst.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfourinline.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgamma.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgeography.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kget.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgoldrunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgpg.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgreet_classic.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgreet_winbind.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khangman.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khelpcenter.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khotkeys.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khotnewstuff.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khtmlkttsd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kinetd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kinfocenter.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_archive.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_audiocd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_finger.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_fish.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_floppy.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_help4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_imap4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_jabberdisco.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_ldap.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_man.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_mbox.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_nfs.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_nntp.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_pop3.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_remote.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_settings.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_sftp.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_sieve.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_smb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_smtp.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_svn.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_thumbnail.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_trash.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_zeroconf.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kioclient.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kioexec.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kiriki.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kiten.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kjots.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kjumpingcube.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klaptopdaemon.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klettres.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klines.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klipper.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klock.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmag.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmahjongg.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmenuedit.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_asus.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_delli8k.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_generic.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_kvaio.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_powerbook.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_thinkpad.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilod.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmimetypefinder.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmines.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmix.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmoon.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmousetool.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmouth.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmplot.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knetattach.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knetwalk.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knetworkconf.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knotify4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kolf.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kolourpaint4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kompare.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konqueror.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konquest.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konsole.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kopete.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpackage.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpartsaver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpasswdserver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpat.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpercentage.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kppp.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kppplogview.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kquitapp.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krandr.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krdb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krdc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kreadconfig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_bugzilla.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kreversi.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krfb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kruler.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_bookmarksrunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_calculatorrunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_locationsrunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_searchrunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_webshortcutsrunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kolourpaint.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksame.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksayit.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kscanplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kscd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kscreensaver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kshisen.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kshorturifilter.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksim.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksmserver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksnapshot.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kspaceduel.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksplashthemes.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksquares.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstars.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstart.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstartperf.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstyle_config.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstyle_keramik_config.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstyle_phase_config.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksudoku.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksysguard.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksystraycmd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksysv.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kteatime.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktexteditor_plugins.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kthememanager.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktimer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktip.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktouch.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktraderclient.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktron.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kttsd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktuberling.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kturtle.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktux.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuiserver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuiviewer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kurifilter.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuser.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwalletmanager.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kweather.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin_art_clients.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin_clients.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin_effects.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin_lib.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwordquiz.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kworldclock.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwrite.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwriteconfig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kxkb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kxsconfig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libKTTSD.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkblog.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkcal.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkcddb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkcompactdisc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkdeedu.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkdegames.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkldap.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkmahjongg.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkmime.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkonq.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkpimidentities.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkpimutils.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkresources.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkscreensaver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libktnef.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkworkspace.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkxmlrpcclient.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libmailtransport.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libphonon.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libplasma.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libtaskmanager.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/lskat.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/marble.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/nepomukcoreservices.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/nepomukserver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/nsplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/oktetapart.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_chm.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_djvu.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_dvi.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_fictionbook.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_ghostview.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_kimgio.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_ooo.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_plucker.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_poppler.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_tiff.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_xps.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/parley.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/phonon-xine.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/phonon_kde.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_battery.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_clock.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_desktop.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_devicenotifier.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_dig_clock.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_kget.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_knewsticker.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_launcher.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_pager.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_skapplet.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_tasks.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_engine_dict.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasmaengineexplorer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/processcore.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/processui.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/secpolicy.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/solidcontrol.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/solidshell.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/soliduiserver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/spy.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/strigila_diff.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/superkaramba.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/svgpart.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/sweeper.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/systemsettings.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/timezones4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/umbrello.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/useraccount.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdgantt.mo
+rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
+
+# keep these ones because we're shipping KDE 3 kdewebdev (because of Quanta)
+# rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfilereplace.mo
+# rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kimagemapeditor.mo
+# rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klinkstatus.mo
+
+# remove docs which conflict with KDE 4 kde-l10n
+rm -rf %{buildroot}%{_docdir}/HTML/*/amor
+rm -rf %{buildroot}%{_docdir}/HTML/*/ark
+rm -rf %{buildroot}%{_docdir}/HTML/*/blinken
+rm -rf %{buildroot}%{_docdir}/HTML/*/bovo
+rm -rf %{buildroot}%{_docdir}/HTML/*/cervisia
+rm -rf %{buildroot}%{_docdir}/HTML/*/common
+rm -rf %{buildroot}%{_docdir}/HTML/*/dolphin
+rm -rf %{buildroot}%{_docdir}/HTML/*/gwenview
+rm -rf %{buildroot}%{_docdir}/HTML/*/irkick
+rm -rf %{buildroot}%{_docdir}/HTML/*/juk
+rm -rf %{buildroot}%{_docdir}/HTML/*/kalgebra
+rm -rf %{buildroot}%{_docdir}/HTML/*/kalzium
+rm -rf %{buildroot}%{_docdir}/HTML/*/kamera
+rm -rf %{buildroot}%{_docdir}/HTML/*/kanagram
+rm -rf %{buildroot}%{_docdir}/HTML/*/kapptemplate
+rm -rf %{buildroot}%{_docdir}/HTML/*/kate
+rm -rf %{buildroot}%{_docdir}/HTML/*/kate-plugins
+rm -rf %{buildroot}%{_docdir}/HTML/*/katomic
+rm -rf %{buildroot}%{_docdir}/HTML/*/kbattleship
+rm -rf %{buildroot}%{_docdir}/HTML/*/kblackbox
+rm -rf %{buildroot}%{_docdir}/HTML/*/kbounce
+rm -rf %{buildroot}%{_docdir}/HTML/*/kbruch
+rm -rf %{buildroot}%{_docdir}/HTML/*/kbugbuster
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcachegrind
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcalc
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcharselect
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcmlirc
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcontrol
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcron
+rm -rf %{buildroot}%{_docdir}/HTML/*/kdat
+rm -rf %{buildroot}%{_docdir}/HTML/*/kdebugdialog
+rm -rf %{buildroot}%{_docdir}/HTML/*/kdesu
+rm -rf %{buildroot}%{_docdir}/HTML/*/kdesvn-build
+rm -rf %{buildroot}%{_docdir}/HTML/*/kdf
+rm -rf %{buildroot}%{_docdir}/HTML/*/kdm
+rm -rf %{buildroot}%{_docdir}/HTML/*/kfind
+rm -rf %{buildroot}%{_docdir}/HTML/*/kfloppy
+rm -rf %{buildroot}%{_docdir}/HTML/*/kfourinline
+rm -rf %{buildroot}%{_docdir}/HTML/*/kgamma
+rm -rf %{buildroot}%{_docdir}/HTML/*/kgeography
+rm -rf %{buildroot}%{_docdir}/HTML/*/kget
+rm -rf %{buildroot}%{_docdir}/HTML/*/kgoldrunner
+rm -rf %{buildroot}%{_docdir}/HTML/*/kgpg
+rm -rf %{buildroot}%{_docdir}/HTML/*/khangman
+rm -rf %{buildroot}%{_docdir}/HTML/*/khelpcenter
+rm -rf %{buildroot}%{_docdir}/HTML/*/kig
+rm -rf %{buildroot}%{_docdir}/HTML/*/kinfocenter
+rm -rf %{buildroot}%{_docdir}/HTML/*/kiriki
+rm -rf %{buildroot}%{_docdir}/HTML/*/kioslave
+rm -rf %{buildroot}%{_docdir}/HTML/*/kiten
+rm -rf %{buildroot}%{_docdir}/HTML/*/kjots
+rm -rf %{buildroot}%{_docdir}/HTML/*/kjumpingcube
+rm -rf %{buildroot}%{_docdir}/HTML/*/klettres
+rm -rf %{buildroot}%{_docdir}/HTML/*/klines
+rm -rf %{buildroot}%{_docdir}/HTML/*/klipper
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmag
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmahjongg
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmenuedit
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmines
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmix
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmoon
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmousetool
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmouth
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmplot
+rm -rf %{buildroot}%{_docdir}/HTML/*/knetattach
+rm -rf %{buildroot}%{_docdir}/HTML/*/knetwalk
+rm -rf %{buildroot}%{_docdir}/HTML/*/knetworkconf
+rm -rf %{buildroot}%{_docdir}/HTML/*/knewsticker
+rm -rf %{buildroot}%{_docdir}/HTML/*/kolf
+rm -rf %{buildroot}%{_docdir}/HTML/*/kolourpaint
+rm -rf %{buildroot}%{_docdir}/HTML/*/kompare
+rm -rf %{buildroot}%{_docdir}/HTML/*/konqueror
+rm -rf %{buildroot}%{_docdir}/HTML/*/konquest
+rm -rf %{buildroot}%{_docdir}/HTML/*/konsole
+rm -rf %{buildroot}%{_docdir}/HTML/*/kopete
+rm -rf %{buildroot}%{_docdir}/HTML/*/kpackage
+rm -rf %{buildroot}%{_docdir}/HTML/*/kpat
+rm -rf %{buildroot}%{_docdir}/HTML/*/kpercentage
+rm -rf %{buildroot}%{_docdir}/HTML/*/kppp
+rm -rf %{buildroot}%{_docdir}/HTML/*/krdc
+rm -rf %{buildroot}%{_docdir}/HTML/*/kreversi
+rm -rf %{buildroot}%{_docdir}/HTML/*/krfb
+rm -rf %{buildroot}%{_docdir}/HTML/*/kruler
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksame
+rm -rf %{buildroot}%{_docdir}/HTML/*/kscd
+rm -rf %{buildroot}%{_docdir}/HTML/*/kshisen
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksim
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksnapshot
+rm -rf %{buildroot}%{_docdir}/HTML/*/kspaceduel
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksquares
+rm -rf %{buildroot}%{_docdir}/HTML/*/kstars
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksudoku
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksysguard
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksysv
+rm -rf %{buildroot}%{_docdir}/HTML/*/kteatime
+rm -rf %{buildroot}%{_docdir}/HTML/*/ktimer
+rm -rf %{buildroot}%{_docdir}/HTML/*/ktouch
+rm -rf %{buildroot}%{_docdir}/HTML/*/ktron
+rm -rf %{buildroot}%{_docdir}/HTML/*/kttsd
+rm -rf %{buildroot}%{_docdir}/HTML/*/ktuberling
+rm -rf %{buildroot}%{_docdir}/HTML/*/kturtle
+rm -rf %{buildroot}%{_docdir}/HTML/*/kuser
+rm -rf %{buildroot}%{_docdir}/HTML/*/kwallet
+rm -rf %{buildroot}%{_docdir}/HTML/*/kweather
+rm -rf %{buildroot}%{_docdir}/HTML/*/kwordquiz
+rm -rf %{buildroot}%{_docdir}/HTML/*/kworldclock
+rm -rf %{buildroot}%{_docdir}/HTML/*/kwrite
+rm -rf %{buildroot}%{_docdir}/HTML/*/kxkb
+rm -rf %{buildroot}%{_docdir}/HTML/*/lskat
+rm -rf %{buildroot}%{_docdir}/HTML/*/marble
+rm -rf %{buildroot}%{_docdir}/HTML/*/okular
+rm -rf %{buildroot}%{_docdir}/HTML/*/parley
+rm -rf %{buildroot}%{_docdir}/HTML/*/plasma
+rm -rf %{buildroot}%{_docdir}/HTML/*/sonnet
+rm -rf %{buildroot}%{_docdir}/HTML/*/superkaramba
+rm -rf %{buildroot}%{_docdir}/HTML/*/umbrello
+
+# keep these ones because we're shipping KDE 3 kdewebdev (because of Quanta)
+# rm -rf %{buildroot}%{_docdir}/HTML/*/kfilereplace
+# rm -rf %{buildroot}%{_docdir}/HTML/*/kimagemapeditor
+# rm -rf %{buildroot}%{_docdir}/HTML/*/klinkreplace
+# rm -rf %{buildroot}%{_docdir}/HTML/*/xsldbg
+
+# remove .mo files which conflict with KDE 4 extragear
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcoloredit.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kiconedit.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kaudiocreator.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmid.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/akregator_konqplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/autorefresh.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/babelfish.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/crashesplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/dirfilterplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/domtreeviewer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/fsview.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/imgalleryplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khtmlsettingsplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konqsidebar_mediaplayer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konqsidebar_metabar.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konqsidebar_news.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/mf_konqplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/minitoolsplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/rellinks.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/searchbarplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/uachangerplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/validatorsplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/webarchiver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpovmodeler.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuickshow.mo
+
+# remove docs which conflict with KDE 4 extragear
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcoloredit
+rm -rf %{buildroot}%{_docdir}/HTML/*/kiconedit
+rm -rf %{buildroot}%{_docdir}/HTML/*/kaudiocreator
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmid
+rm -rf %{buildroot}%{_docdir}/HTML/*/konq-plugins
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksig
+rm -rf %{buildroot}%{_docdir}/HTML/*/kpovmodeler
+rm -rf %{buildroot}%{_docdir}/HTML/*/kuickshow
+
+# remove obsolete KDE 3 application data translations
+rm -rf %{buildroot}%{_datadir}/apps
+
+# on F10+, also get rid of kdepim stuff
+rm -rf %{buildroot}%{_docdir}/HTML/*/akregator
+rm -rf %{buildroot}%{_docdir}/HTML/*/kaddressbook
+rm -rf %{buildroot}%{_docdir}/HTML/*/kalarm
+rm -rf %{buildroot}%{_docdir}/HTML/*/karm
+rm -rf %{buildroot}%{_docdir}/HTML/*/kleopatra
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmail
+rm -rf %{buildroot}%{_docdir}/HTML/*/knode
+rm -rf %{buildroot}%{_docdir}/HTML/*/knotes
+rm -rf %{buildroot}%{_docdir}/HTML/*/konsolekalendar
+rm -rf %{buildroot}%{_docdir}/HTML/*/kontact
+rm -rf %{buildroot}%{_docdir}/HTML/*/korganizer
+rm -rf %{buildroot}%{_docdir}/HTML/*/korn
+rm -rf %{buildroot}%{_docdir}/HTML/*/kpilot
+rm -rf %{buildroot}%{_docdir}/HTML/*/ktnef
+rm -rf %{buildroot}%{_docdir}/HTML/*/kwatchgnupg
+rm -rf %{buildroot}%{_docdir}/HTML/*/multisynk
+
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/akregator.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_slox.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kaddressbook.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kalarm.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkabconfig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkontactnt.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepimresources.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepimwizards.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_vcf.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_groupwise.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kitchensync.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kleopatra.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail_text_calendar_plugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail_text_vcard_plugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmailcvt.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knode.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knotes.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konsolekalendar.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kontact.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/korganizer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/korn.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpilot.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_birthday.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_featureplan.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_groupware.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_groupwise.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_kolab.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_remote.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_scalix.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_tvanytime.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_xmlrpc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktnef.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwatchgnupg.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkdepim.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkholidays.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkleopatra.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkpgp.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libksieve.mo
 
 # Generieren der Fileliste
 cd $RPM_BUILD_ROOT
@@ -61,6 +692,9 @@ rm -f ../file.list
 %files -f ../file.list
 
 %changelog
+* Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-1
+- new upstream release
+
 * Tue Apr 14 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.8-1
 - applied new versioning policy, spec in UTF-8
 

+ 5 - 8
k/kde-settings/kde-settings-vl.spec

@@ -5,7 +5,7 @@ Summary: Config files for kde
 Summary(ja): KDE の設定ファイル
 Name:    kde-settings
 Version: %{majorver}.%{minorver}
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -111,12 +111,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/kdm
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/fedora-bookmarks.sh \
       $RPM_BUILD_ROOT%{_sysconfdir}/kde/shutdown/gpg-agent*.sh
 
-# rename for profile.d/kde.(sh|csh) for kdelibs3
-mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde.sh \
-    $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde4.sh
-mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde.csh \
-    $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde4.csh
-
 # overwrite pam.d/kdm, pam.d/kdm-np
 install -m644 %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kdm
 install -m644 %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kdm-np
@@ -149,7 +143,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files 
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/profile.d/kde4.*
+%config(noreplace) %{_sysconfdir}/profile.d/kde.*
 %{_sysconfdir}/kde/env/env.sh
 %{_sysconfdir}/kde/env/gpg-agent*.sh
 %{_sysconfdir}/kde/env/gtk2_rc_files.sh
@@ -187,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.13-2
+- /etc/profile.d/kde4.{sh,csh} reverted to original name
+
 * Wed Mar 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.13-1
 - updated to 4.4-13
 - added SOURCE20, 21 to avoid using pam_selinux.so

+ 32 - 40
k/kdeaddons/kdeaddons-vl.spec

@@ -1,13 +1,17 @@
 %define beta 0
 
+# Compile only atlantikdesigner
+%define donotcompilelist doc kaddressbook-plugins kate kfile-plugins kicker-applets knewsticker-scripts konq-plugins ksig noatun-plugins renamedlgplugins
+
 Name: kdeaddons
-Version: 3.5.8
+Summary: K Desktop Environment - Plugins
+Summary(ja): K デスクトップ環境 3 - プラグイン
+Version: 3.5.10
 %if %{beta}
 Release: 1%{beta}%{?_dist_release}
 %else
 Release: 1%{?_dist_release}
 %endif
-Summary: additional plugins and scripts for some KDE applications
 %if %{beta}
 Source: ftp://ftp.kde.org/pub/kde/unstable/%{version}-%{beta}/src/%{name}-%{version}-%{beta}.tar.bz2
 %else
@@ -18,75 +22,63 @@ Group: Applications/Other
 License: GPL
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: qt-devel >= 3.3.2, arts-devel >= 1:1.5.0
-BuildRequires: kdelibs-devel >= %{version}
-BuildRequires: kdebase-devel >= %{version}
-BuildRequires: kdemultimedia-devel >= %{version}
+BuildRequires: kdelibs3-devel >= %{version}
+BuildRequires: kdegames3-devel >= %{version}
 BuildRequires: libxml2-devel >= 2.6.0
 BuildRequires: libxslt-devel >= 1.0.18
 BuildRequires: zlib-devel libjpeg-devel libpng-devel gettext
-Requires: qt >= 3.3.2
-Requires: arts >= 1:1.5.0
-Requires: kdelibs >= %{version}
-Requires: kdebase >= %{version}
-Requires: kdemultimedia >= %{version}
+Requires: kdelibs3 >= %{version}
+Requires: kdegames3 >= %{version}
 
 %description
-kdeaddons contains additional plugins and scripts for some KDE applications.
+Plugins for some KDE applications.
+This package only includes a game board designer for Atlantik.
 
 %prep
 %setup -q
+sed -i -e 's/-lkdegames//g' atlantikdesigner/designer/Makefile.in
 
 %build
-export KDEDIR=%{_prefix}
 unset QTDIR || : ; . /etc/profile.d/qt.sh
+export DO_NOT_COMPILE="%{donotcompilelist}"
 
-./configure --prefix=%{_prefix} \
+%configure \
     --with-qt-libraries=$QTDIR/lib \
-    --with-extra-includes=%{_includedir}/kde/arts \
-    --with-xinerama \
+    --includedir=%{_includedir}/kde \
+    --disable-rpath \
     --enable-new-ldflags \
-    --disable-dependency-tracking \
-    --enable-final \
-    --disable-rpath
+    --disable-debug --disable-warnings \
+    --disable-dependency-tracking --enable-final
 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+export DO_NOT_COMPILE="%{donotcompilelist}"
 make DESTDIR=$RPM_BUILD_ROOT install
 
-# Make symlinks relative
-cd $RPM_BUILD_ROOT/usr/share/doc/HTML/en
-for i in *; do
-	if [ -d $i -a -L $i/common ]; then
-		rm -f $RPM_BUILD_ROOT/usr/share/doc/HTML/en/$i/common
-		ln -sf ../common $RPM_BUILD_ROOT/usr/share/doc/HTML/en/$i
-	fi
-done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+#post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+#postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc %{_datadir}/doc/HTML/en/*
-%{_bindir}/*
-%{_libdir}/kde3/*
-%{_datadir}/applications/*
-%{_datadir}/applnk
-%{_datadir}/apps/*
-%config %{_datadir}/config/*
-%{_datadir}/config.kcfg/*
-%{_datadir}/icons/*
-%{_datadir}/mimelnk/*
-%{_datadir}/services/*
+%doc README COPYING-DOCS atlantikdesigner/TODO
+%{_bindir}/atlantikdesigner
+%{_datadir}/apps/atlantikdesigner/
+%{_datadir}/icons/hicolor/*/*/atlantikdesigner*
+%{_datadir}/applications/kde/atlantikdesigner.desktop
 
 %changelog
+* Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-1
+- updated to 3.5.10, only including atlantikdesigner
+- built with new toolchain
+
 * Sun May 10 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.8-1
 - applied new versioning policy
 - added BR: kdebase-devel

+ 166 - 69
k/kdebase3/kdebase3-vl.spec

@@ -5,8 +5,8 @@
 %define make_cvs 1
 
 Name: kdebase3
-Version: 3.5.8
-Release: 3%{?_dist_release}
+Version: 3.5.10
+Release: 1%{?_dist_release}
 Summary: K Desktop Environment 3 - core files
 Summary(ja): K デスクトップ環境 3 - 基本ファイル
 URL: http://www.kde.org/
@@ -14,6 +14,8 @@ Group: User Interface/Desktops
 License: GPLv2
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
+Source1: konsole.desktop
+
 Source2: kdebase-kde.desktop
 Source4: kde-vine-config-20020805.tar.bz2
 Source5: desktopconv.tar.bz2
@@ -21,18 +23,47 @@ Source6: wizard_small.png
 Source7: mailsettings.cc
 Source8: read_Xresources
 
-# Since the FixupTOC() hack doesn't work with a statically linked cdparanoia,
-# we need to include our own copy, nuke FixupTOC() from it, and link against
-# that.
-Source100: cdparanoia-III-alpha9.8.src.tar.bz2
-Patch100: kdebase-cdparanoia-fixuptoc.patch
-Patch101: kdebase-cdparanoia-build.patch
-
-# KDE.org patches
-Patch0: kdebase-3.5.7-konq-location.diff
-Patch1: kdm3-face-dos.diff
-Patch2: post-3.5.8-kdebase-kdm.diff
-# RH patches
+Source9: cr16-app-package_games_kids.png
+Source10: cr32-app-package_games_kids.png
+Source11: cr48-app-package_games_kids.png
+
+Patch1: kdebase-3.5.9-redhat-startkde.patch
+Patch2: kdebase-3.3.92-vroot.patch
+Patch3: kdebase-3.x-shortcuts.patch
+Patch4: kdebase-3.2.0-keymap.patch
+Patch5: kdebase-3.1-startpage.patch
+Patch6: kdebase-3.1.3-konsole-double-esc.patch
+Patch7: kdebase-3.3.92-kpersonalizer.patch
+Patch8: kdebase-3.2.92-logo.patch 
+Patch10: kdebase-3.4.2-kdesktop-konsole.patch
+Patch11: kdebase-3.5.1-xdg.patch
+Patch13: kdebase-3.5.5-dbus.patch
+Patch14: kdebase-3.5.1-kdm-readme.patch
+Patch15: kdebase-3.5.1-konsole-fonts.patch
+Patch18: kdebase-3.5.2-kconf_update-klipper.patch
+Patch20: kdebase-3.5.5-keyinit.patch
+Patch21: kdebase-3.5.3-khelpcenter-sort.patch
+Patch22: kdebase-3.5.4-htdig.patch
+Patch24: kdebase-3.5.4-tango-icon-theme.patch
+Patch25: kdebase-3.5.4-konqueror-shortcut.patch
+Patch26: kdebase-3.5.5-suspend.patch
+Patch27: kdebase-3.5.8-consolekit-kdm.patch
+Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
+Patch30: kdebase-3.5.7-kio_media_mounthelper.patch
+# kdebase: "Root Shell" sessions will not close, http://bugzilla.redhat.com/301841
+Patch31: kdebase-3.5.10-konsolesu-kdesu.patch
+# modified version of kubuntu_9915_userdiskmount.diff
+# fixes NTFS (#378041) and adds PolicyKit support (#428212)
+Patch36: kdebase-3.5.9-userdiskmount.patch
+# don't link kcm_colors against libkrdb (and don't call runRdb)
+Patch37: kdebase-3.5.10-libkrdb_dep.patch
+# http://aseigo.blogspot.com/2008/10/dear-kde3-kdesktop-users.html
+Patch100: kdebase-3.5.10-minicli-decimal-comma.patch
+Patch101: kdebase-3.5.10-ossl-1.x.patch
+Patch102: arts-acinclude.patch
+
+# security fixes
+
 # Vine patches (700-)
 Patch703: kdebase-3.5.5-pamd.patch
 Patch705: konsole-3.5.8-final.diff
@@ -40,36 +71,66 @@ Patch706: kdebase-3.5.8-fix_ftbfs_ucred_redefinition.patch
 # KDE.gr.jp patches (800-)
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: qt-devel >= 3.3.2
 BuildRequires: kdelibs3-devel >= %{version}
-BuildRequires: arts-devel >= 1:1.5.0
-BuildRequires: libxml2-devel >= 2.4.12
-BuildRequires: openldap-devel pam-devel
-BuildRequires: zlib-devel openssl-devel libart_lgpl-devel libjpeg-devel
-BuildRequires: libtiff-devel jasper-devel cyrus-sasl-devel
-BuildRequires: openMotif-devel ncurses-devel gettext
-BuildRequires: libpng-devel >= 1.2.5
-BuildRequires: gamin-devel esound-devel libidn-devel
-BuildRequires: glib2-devel libusb-devel freetype2-devel
-BuildRequires: alsa-lib-devel
-%if %{vine4}
+BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: pam-devel
+BuildRequires: gettext
+BuildRequires: perl
+BuildRequires: sed
+%if %{make_cvs}
+BuildRequires: automake libtool
+%endif
+BuildRequires: pkgconfig
+BuildRequires: doxygen
+
+BuildRequires: dbus-devel dbus-qt3-devel hal-devel
+BuildRequires: bzip2-devel
+BuildRequires: freetype2-devel
+BuildRequires: openldap-devel 
+BuildRequires: cyrus-sasl-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: libraw1394-devel
+BuildRequires: libusb-devel
+BuildRequires: OpenEXR-devel
+BuildRequires: gtk2-devel
+%if %{?_dist_release} == "vl4"
 BuildRequires: samba-libsmbclient-devel >= 3.0.4 
-BuildRequires: XOrg-gl-devel
+BuildRequires: XOrg-devel XOrg-gl-devel
 %else
 BuildRequires: libsmbclient-devel >= 3.0.4 
+## X11 support details (xmkmf, bdftopcf)
+BuildRequires: xorg-x11-font-utils
+BuildRequires: imake
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: libfontenc-devel
+BuildRequires: libXScrnSaver-devel
+BuildRequires: libXdamage-devel
+BuildRequires: libXcomposite-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXrandr-devel
+BuildRequires: libXrender-devel
+BuildRequires: libXfixes-devel
+BuildRequires: libXext-devel
+BuildRequires: libXtst-devel
+BuildRequires: libXxf86misc-devel
+BuildRequires: libxkbfile-devel
 BuildRequires: mesa-libGL-devel mesa-libGLU-devel
 %endif
-BuildRequires: hal-devel dbus-devel dbus-qt3-devel
+BuildRequires: cdparanoia cdparanoia-devel
 
 Requires: qt >= 3.3.2
 Requires: kdelibs3 >= %{version}
 Requires: libxml2 >= 2.4.12 
 Requires: coreutils audiofile gdbm openldap cyrus-sasl
 Requires: hicolor-icon-theme
-%if %{vine4}
+%ifarch %{ix86} x86_64 ia64 ppc ppc64
+Requires: pm-utils
+%endif
+
+%if %{?_dist_release} == "vl4"
 Requires: XOrg-libs XOrg-xfs xinitrc 
 Requires: samba-libsmbclient
-Requires(post): XOrg-font-utils
+Prereq: XOrg-font-utils
 %else
 Requires: xorg-x11-xinit
 Requires(post): xorg-x11-font-utils
@@ -80,13 +141,16 @@ Obsoletes: kdebase < %{version}-%{release}
 Provides: kdebase = %{version}-%{release}
 
 %description
-Core runtime files for the K Desktop Environment 3, for 
-compatibility with KDE 3 applications.
+Core runtime files for KDE 3, for compatibility with KDE 3 applications.
+
 
 %package devel
-Summary: Development files for kdebase
-Requires: %{name} = %{version}-%{release}
+Summary: Development files for %{name}
 Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs3-devel
+Provides: kdebase-devel = %{version}-%{release}
+Obsoletes: kdebase-devel < %{version}-%{release}
 
 %description devel
 Header files for developing applications using kdebase.
@@ -95,29 +159,63 @@ Kate plugins or KWin styles.
 
 %prep
 %setup -q -n kdebase-%{version}
-%patch0 -p1 -b .location
-cd kdm
-%patch1 -p0
-cd -
-%patch2 -p0
+%patch1 -p1 -b .redhat-startkde
+%patch2 -p1 -b .vroot
+%patch3 -p1 -b .shortcuts
+%patch4 -p1 -b .keymap
+%patch5 -p1
+%patch6 -p1 -b .konsole
+%patch7 -p1 -b .kper
+%patch8 -p1 -b .logo
+%patch10 -p1 -b .kdestop-konsole
+%patch11 -p1 -b .xdg
+%patch13 -p1 -b .dbus
+%patch14 -p1 -b .kdm-readme
+%patch15 -p1 -b .konsole-fonts
+%patch18 -p1 -b .klipper
+%patch20 -p1 -b .keyinit
+%patch21 -p1 -b .khelpcenter-sort
+%patch22 -p1 -b .htdig
+%patch24 -p1 -b .tango-icon-theme
+%patch25 -p1 -b .konqueror-shortcut
+%patch26 -p1 -b .suspend
+%patch27 -p1 -b .consolekit
+%patch28 -p1 -b .kdm-alternatebackground
+%patch30 -p1 -b .bz#265801
+%patch31 -p1 -b .konsolesu-kdesu
+%patch36 -p1 -b .userdiskmount
+%patch37 -p1 -b .libkrdb_dep
+%patch100 -p1 -b .minicli-decimal-comma
+%patch101 -p1 -b .ossl-1.x
+%patch102 -p1 -b .autoconf
+
+# Vine patches
 %patch703 -p1 -b .pamd
 %patch705 -p0
 %patch706 -p1 -b .ucred
 
-tar xjf %{SOURCE100}
-%patch100 -p0 -b .toc
-%patch101 -p1 -b .build
+#tar xjf %{SOURCE100}
+#%patch100 -p0 -b .toc
+#%patch101 -p1 -b .build
+
+# security fixes
 
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
 # colors is pending on http://bugzilla.redhat.com/443343
 sed -i.omit -e 's|^FONTINST_SUBDIR=kfontinst|#FONTINST_SUBDIR=kfontinst|' \
   -e 's/background//' -e 's/clock//' -e 's/display//' -e 's/energy//' \
   -e 's/fonts//' -e 's/icons//' \
-  -e 's/kdm//' -e 's/kicker//' -e 's/kthememanager//' \
+  -e 's/kdm//' -e 's/kicker//' -e 's/krdb//' -e 's/kthememanager//' \
   -e 's/locale//' \
   -e 's/screensaver//' -e 's/style//' -e 's/taskbar//' -e 's/xinerama//' \
   kcontrol/Makefile.am
-#-e 's/krdb//' 
+
+cp %{SOURCE1} konsole
+# set Konqueror version
+perl -pi -e "s,^#define.*KONQUEROR_VERSION.*,#define KONQUEROR_VERSION \"%{version}-%{release} Vine Linux\"," konqueror/version.h
+
+# add missing icons for package_games_kids
+install -p -m644 %{SOURCE9} %{SOURCE10} %{SOURCE11} pics/crystalsvg/
 
 %if %{make_cvs}
 # hack/fix for newer automake
@@ -126,14 +224,7 @@ sed -i.omit -e 's|^FONTINST_SUBDIR=kfontinst|#FONTINST_SUBDIR=kfontinst|' \
 %endif
 
 %build
-mkdir -p cdparanoia/include cdparanoia/lib
-cd cdparanoia-III-alpha9.8
-%configure
-make || :
-mv */*.a ../cdparanoia/lib
-mv */*.h ../cdparanoia/include
-cd ..
-
+# set some default enviroments
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export DO_NOT_COMPILE="kappfinder kdesktop kdesu klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
@@ -144,30 +235,31 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass drkonqi"
 # kate for kscope
 # export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol konsole kioslave kate"
 
-CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -UDEBUG" \
-./configure \
-    --prefix=%{_prefix} \
+%configure \
     --with-qt-libraries=$QTDIR/lib \
-    --with-xdmdir=%{_sysconfdir}/X11/xdm \
-    --with-pam=%{pamservice} \
     --enable-new-ldflags \
     --disable-dependency-tracking \
+    --with-pam=yes \
+    --with-kde-pam=kdm \
+    --with-kcp-pam=kcheckpass \
+    --with-kss-pam=kscreensaver \
+    --with-libraw1394 \
+    --with-openexr \
+    --with-samba \
     --with-xinerama \
+    --with-xscreensaver \
     --without-shadow \
-    --disable-shadow \
-    --enable-final \
+    --disable-rpath \
     --sysconfdir=%{_sysconfdir} \
-    --disable-greet-lib \
-    --with-cdparanoia="`pwd`/cdparanoia" \
+    --enable-final \
     --disable-debug \
-    --without-debug \
-    --includedir=%{_includedir}/kde \
-    --disable-rpath
-#    --with-motif-includes=/usr/X11R6/include \
-#    --with-motif-libraries=/usr/X11R6/lib \
+    --includedir=%{_includedir}/kde 
 
 make %{?_smp_mflags}
 
+# build mail setting tool
+g++ $CXXFLAGS -o mailsettings %{SOURCE7}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make RUN_KAPPFINDER=no DESTDIR=$RPM_BUILD_ROOT install
@@ -258,7 +350,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/xsessions/kde.desktop
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/cookies.desktop
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/desktop.desktop
 
-# remove mediamanager stuff #447852 and kdebug:163717
+# remove mediamanager stuff #447852 and kdebug:163717
 rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/kded_mediamanager.*
 rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/kded_medianotifier.*
 rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/kcm_media.*
@@ -344,7 +436,7 @@ fi
 %doc AUTHORS COPYING README
 %doc %{_docdir}/HTML/en/*
 %{_datadir}/config.kcfg/*
-#{_bindir}/kde3
+%{_bindir}/kde3
 %{_bindir}/kio_media_mounthelper
 %{_bindir}/kio_system_documenthelper
 %{_bindir}/kdcop
@@ -361,7 +453,7 @@ fi
 %{_datadir}/servicetypes/*
 %{_datadir}/sounds/*
 %{_libdir}/kde3/*
-%{_libdir}/libkdeinit_*.*
+%{_libdir}/libkdeinit_*.so
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
 
@@ -372,6 +464,11 @@ fi
 %exclude %{_libdir}/libkdeinit_*.so
 
 %changelog
+* Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-1
+- updated to 3.5.10 based on FC
+- removed the static cdparanoia hack
+- built with new toolchain
+
 * Sun Aug 30 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.8-3
 - fixed macros for building VineSeed
 

+ 44 - 20
k/kdegames3/kdegames3-vl.spec

@@ -1,30 +1,40 @@
+%define make_cvs 1
+
 # These games are already in KDE 4.
 %define donotcompilelist katomic kbattleship kblackbox kbounce kgoldrunner kjumpingcube klines kmahjongg kmines knetwalk kolf konquest kpat kreversi ksame kshisen kspaceduel ktron ktuberling kwin4 lskat
 
 Name: kdegames3
-Version: 3.5.8
-Release: 2%{?_dist_release}
 Summary: K Desktop Environment 3 - Games not ported to KDE 4
 Summary(ja): K デスクトップ環境 3 - KDE 4 に移植されていないゲーム集
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
-URL: http://www.kde.org/
-Group: Applications/Games
+Version: 3.5.10
+Release: 1%{?_dist_release}
+
 License: GPLv2
+Group: Applications/Games
+URL: http://www.kde.org/
+
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
+Patch0: kdegames-3.5.10-trademarks.patch
+# fix build with make_cvs enabled and autoconf >= 2.64
+Patch1: arts-acinclude.patch
+# fix FTBFS with the new stricter ld in F13 (#565113)
+Patch2: kdegames-3.5.10-ftbfs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: qt-devel >= 3.3.2
-BuildRequires: arts-devel >= 1:1.5.0
 BuildRequires: kdelibs3-devel >= %{version}
-BuildRequires: zlib-devel libjpeg-devel libpng-devel
+BuildRequires: zlib-devel libpng-devel libjpeg-devel
+%if %{make_cvs}
+BuildRequires: automake libtool
+%endif
 Requires: kdelibs3 >= %{version}
 Requires: hicolor-icon-theme 
 
 %description
-Games and gaming libraries for the K Desktop Environment which have not been
-ported to KDE 4 yet.
+Games and gaming libraries for KDE which have not been ported to KDE 4 yet.
 Included with this package are: atlantik, kasteroids, kbackgammon, kboxpush,
 kenolaba, kfouleggs, klickety, kpoker, ksirtet, ksmiletris, ksnake.
 
+
 %package devel
 Summary: Development files for kdegames3
 Summary(ja): kdegames3 の開発用ファイル
@@ -40,21 +50,31 @@ KDE desktop.
 
 %prep
 %setup -q -n kdegames-%{version}
+%patch0 -p1
+%patch1 -p1 -b .autoconf
+%patch2 -p1 -b .ftbfs
 
-%build
-export KDEDIR=%{_prefix}
 export DO_NOT_COMPILE="%{donotcompilelist}"
+%if %{make_cvs}
+# hack/fix for newer automake
+  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
+  make -f admin/Makefile.common cvs
+%endif
+
+%build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-CFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DNDEBUG" \
-CXXFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DNDEBUG -fno-check-new" \
-./configure --prefix=%{_prefix} \
+export DO_NOT_COMPILE="%{donotcompilelist}"
+
+%configure \
     --with-qt-libraries=$QTDIR/lib \
-    --includedir=%{_includedir}/kde \
-    --with-xinerama \
     --enable-new-ldflags \
     --disable-dependency-tracking \
+    --disable-rpath \
     --enable-final \
-    --disable-rpath
+    --disable-debug \
+    --disable-warnings \
+    --includedir=%{_includedir}/kde \
+    --disable-setgid
 
 make %{?_smp_mflags}
 
@@ -67,8 +87,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # locales
 %find_lang %{name} || touch %{name}.lang
 HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
+if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
+for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
   if [ -d $lang_dir ]; then
     # remove documentation for games we don't ship
     pushd $lang_dir
@@ -151,6 +171,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-1
+- updated to 3.5.10 based on FC
+- built with new toolchain
+
 * Sun Aug 30 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.8-2
 - renamed kdegames3
 

+ 207 - 79
k/kdelibs3/kdelibs3-vl.spec

@@ -1,35 +1,100 @@
+#define qt3 qt3
+%define qt3_version 3.3.8
+%define qt3_docdir %{_docdir}/qt-devel-%{qt3_version}
+
 %define kde_major_version 3
 %define vine3 %(grep -c 3. /etc/vine-release)
 %define vine5 %(grep -c 5. /etc/vine-release)
-#define __libtoolize :
+
+%define apidocs 1
 
 Summary: K Desktop Environment 3 - Libraries
 Summary(ja): K デスクトップ環境 3 - ライブラリ
 Name: kdelibs3
-Version: 3.5.8
-Release: 3%{?_dist_release}
+Version: 3.5.10
+Release: 1%{?_dist_release}
 
+License: LGPLv2
+URL: http://www.kde.org/
 Group: System Environment/Libraries
-License: LGPL
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
 
+# Source1, 2 isn't installed now. replaced by kde-settings
 Source1: kde.sh
 Source2: kde.csh
 Source3: devices.protocol
 
-# KDE.org patches
-Patch0: post-3.3.2-kdelibs-kioslave.patch
-Patch2: kdelibs-3.5.5-khtml-overflow-CVE-2006-4811.patch
-Patch4: kdelibs-3.5.8-http.patch
-Patch5: kdelibs-3.5.8-kactionclasses.diff
-# RH patches
-Patch10: kdelibs-3.4.0-menu.patch
-# Japanese patches
-Patch20: kzip.cpp.diff
+Patch1: kdelibs-3.5.1-xdg-menu.patch
+Patch2: kdelibs-3.0.0-ndebug.patch
+Patch4: kdelibs-3.0.4-ksyscoca.patch
+Patch5: kdelibs-3.5.10-openssl.patch
+Patch15: kdelibs-3.4.91-buildroot.patch
+Patch32: kdelibs-3.2.3-cups.patch
+Patch33: kdelibs-3.3.2-ppc.patch
+Patch34: kdelibs-3.4.0-qtdoc.patch
+Patch35: kdelibs-3.4.92-inttype.patch
+Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
+Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
+Patch39: kdelibs-3.5.4-kabc-make.patch
+Patch40: kdelibs-3.5.4-kdeprint-utf8.patch
+Patch41: kdelibs-3.5.6-utempter.patch
+Patch43: kdelibs-3.5.6-lang.patch
+Patch45: kdelibs-3.5.7-autostart.patch
+Patch46: kdelibs-3.5.8-kate-vhdl.patch
+Patch48: kdelibs-3.5.8-kspell-hunspell.patch
+Patch49: kdelibs-3.5.8-kspell2-enchant.patch
+Patch50: kdelibs-3.5.8-kspell2-no-ispell.patch
+Patch51: kdelibs-3.5.9-cupsserverbin.patch
+# initial support for (Only|Not)ShowIn=KDE3
+Patch52: kdelibs-3.5.9-KDE3.patch
+# use /usr/libexec/kde4/drkonqi in KCrash (#453243)
+Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
 # fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
 Patch54: kdelibs-3.5.9-fix-flock-redefinition.patch
+# update the KatePart latex.xml syntax definition to the version from Kile 2.0.3
+Patch55: kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch
+
 # Other patches
-Patch100: kdelibs-3.5.6-add-dnssd-avahi-support.patch
+# use /etc/kde in addition to /usr/share/config, borrowed from debian
+Patch100: kdelibs-3.5.5-kstandarddirs.patch
+# http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
+Patch101: kde-3.5-libtool-shlibext.patch
+# kget ignores simultaneous download limit (kde #101956)
+Patch103: kdelibs-3.5.0-101956.patch
+Patch104: kdelibs-3.5.10-gcc44.patch
+Patch105: kdelibs-3.5.10-ossl-1.x.patch
+Patch106: kdelibs-3.5.10-kio.patch
+Patch107: kdelibs-3.5.10-assert.patch
+Patch108: kdelibs-3.5.10-dtoa.patch
+Patch109: kdelibs-3.5.10-kabc.patch
+Patch110: arts-acinclude.patch
+# kde4.4 backport
+Patch111: kdelibs-3.5.10-kde-config_kde-version.patch
+
+# Japanese patches
+Patch120: kzip.cpp.diff
+# RH patches (do we need this patch in KDE3 environment like Vine Linux 4.x?)
+Patch121: kdelibs-3.4.0-menu.patch
+
+## security fixes
+# fix CVE-2009-2537 - select length DoS
+Patch200: kdelibs-3.5.10-cve-2009-2537-select-length.patch
+# fix CVE-2009-1725 - crash, possible ACE in numeric character references
+Patch201: kdelibs-3.5.10-cve-2009-1725.patch
+# fix CVE-2009-1690 - crash, possible ACE in KHTML (<head> use-after-free)
+Patch202: kdelibs-3.5.4-CVE-2009-1687.patch
+# fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?)
+Patch203: kdelibs-3.5.4-CVE-2009-1690.patch
+# fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
+Patch204: kdelibs-3.5.10-cve-2009-1698.patch
+# fix CVE-2009-2702 - ssl incorrect verification of SSL certificate with NUL in subjectAltName
+Patch205: kdelibs-3.5.10-CVE-2009-2702.patch
+# fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs
+Patch206: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch
+# CVE-2009-3736, libltdl may load and execute code from a library in the current directory
+Patch207: libltdl-CVE-2009-3736.patch
+# fix CVE-2006-4811 (former Patch2)
+Patch220: kdelibs-3.5.5-khtml-overflow-CVE-2006-4811.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cups-devel >= 1.1.12
@@ -43,24 +108,24 @@ BuildRequires: jasper-devel bzip2-devel gettext openssl-devel
 BuildRequires: libpng-devel >= 1.2.5
 BuildRequires: docbook-dtds aspell-devel libidn-devel gamin-devel
 BuildRequires: OpenEXR-devel
-%if !%{vine3}
 BuildRequires: alsa-lib-devel avahi-qt3-devel
-%endif
-%if %{vine5}
+%if %{?_dist_release} != "vl4"
 BuildRequires: libICE-devel libSM-devel
 BuildRequires: libX11-devel libXext-devel libXft-devel libXrender-devel
 BuildRequires: krb5-devel
+%else
+# Vine Linux 4.x
+BuildRequires: XOrg-devel
 %endif
 
 Requires: qt >= 3.3.2 arts >= 1:1.5.0 perl python libart_lgpl openldap
 Requires: pcre cyrus-sasl libogg libvorbis jasper openssl libidn
 Requires: cups-libs >= 1.1.12
-%if !%{vine3} 
 Requires: alsa-lib
 Requires: vine-menus
 Requires: nss-mdns
 Requires: hicolor-icon-theme
-%endif
+Requires: kde-settings
 
 Provides: crystalsvg-icon-theme = %{version}-%{release}
 Obsoletes: kdesupport
@@ -71,17 +136,16 @@ Provides:  kdelibs = %{version}-%{release}
 %description
 Libraries for the K Desktop Environment 3:
 KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
-libkscreensaver (screensaver), khtmlw (HTML widget), 
-kio (Input/Output, networking), kspell (spelling checker), kjs (javascript), 
-kabc (addressbook), kimgio (image manipulation).
+kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
+kspell (spelling checker), jscript (javascript), kabc (addressbook),
+kimgio (image manipulation).
 
 %description -l ja
 K デスクトップ環境 3 用のライブラリ:
-KDE ライブラリに含まれるもの: kdecore (KDEコアライブラリ),kdeui 
-(ユーザインタフェース),libscreensaver (スクリーンセーバ),
-khtmlw (HTMLウィジェット)、kio (入出力, ネットワーク),kspell (ス
-ペルチェッカー),kjs (javascript),kabc (アドレス帳),kimgio (イメ
-ージ操作)
+KDE ライブラリは以下のものを含みます: kdecore (KDEコアライブラリ),kdeui 
+(ユーザインタフェース),kfm (ファイルマネージャ),khtmlw (HTMLウィジェット),
+kio (入出力, ネットワーク),kspell (スペルチェッカー),kjs (javascript),
+kabc (アドレス帳),kimgio (イメージ操作)
 
 %package devel
 Summary: Header files and documentation for compiling KDE 3 applications.
@@ -118,30 +182,72 @@ format for easy browsing
 
 %prep
 %setup -q -n kdelibs-%{version}
-%patch0 -p0
-%patch2 -p1
-%patch4 -p4
-%patch5 -p4
-cd kio/kio
-%patch20 -p0
-cd -
-%if !%{vine3}
-%patch10 -p1 -b -menu
-%patch100 -p1 -b .kdnssd
-%endif
+
+%patch1 -p1 -b .xdg-menu
+%patch2 -p1 -b .debug
+%patch4 -p1 -b .ksyscoca
+%patch5 -p1 -b .openssl
+%patch15 -p1 -b .buildroot
+%patch32 -p1 -b .cups
+%patch33 -p1 -b .ppc
+%patch34 -p1 -b .qtdoc
+%patch35 -p1 -b .inttype
+%patch37 -p1 -b .kdebug-kmail-quiet
+%patch38 -p1 -b .cupsdconf2-group
+%patch39 -p1 -b .kabc-make
+%patch40 -p1 -b .kdeprint-utf8
+%patch41 -p1 -b .utempter
+%patch43 -p1 -b .lang
+%patch45 -p1 -b .xdg-autostart
+%patch46 -p1 -b .kate-vhdl
+%patch48 -p1 -b .kspell
+%patch49 -p1 -b .kspell2
+%patch50 -p1 -b .no-ispell
+%patch51 -p1 -b .cupsserverbin
+%patch52 -p1 -b .KDE3
+%patch53 -p1 -b .drkonqi-kde4
 %patch54 -p1 -b .flock-redefinition
+%patch55 -p1 -b .latex-syntax
+
+%patch100 -p1 -b .kstandarddirs
+%patch101 -p1 -b .libtool-shlibext
+%patch104 -p1 -b .gcc44
+%patch105 -p1 -b .ossl-1.x
+%patch106 -p1 -b .kio
+%patch107 -p1 -b .assert
+%patch108 -p1 -b .alias
+%patch109 -p1 -b .kabc
+%patch110 -p1 -b .autoconf
+%patch111 -p1 -b .kde-config_kde-version
+pushd kio/kio
+%patch120 -p0
+popd
+#patch121 -p1
+
+# security fixes
+%patch200 -p1 -b .cve-2009-2537
+%patch201 -p0 -b .cve-2009-1725
+%patch202 -p1 -b .cve-2009-1687
+%patch203 -p1 -b .cve-2009-1690
+%patch204 -p1 -b .cve-2009-1698
+%patch205 -p1 -b .cve-2009-2702
+%patch206 -p0 -b .oCERT-2009-015-xmlhttprequest
+%patch207 -p1 -b .CVE-2009-3736
+%patch220 -p1 -b .CVE-2006-4811
 
 # Make the version number say what it should say
 perl -pi -e 's,#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING "%{version}-%{release}",g' kdecore/kdeversion.h
 
-%build
-# kdnssd-avahi support
-%if !%{vine3}
+# hack/fix for newer automake
+sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
 make -f admin/Makefile.common cvs
-%endif
 
+
+%build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
+export QTDOC=%{qt3_docdir}
+
 if [ -x /etc/profile.d/krb5.sh ]; then
   . /etc/profile.d/krb5.sh
 elif ! echo ${PATH} | grep -q /usr/kerberos/bin ; then
@@ -150,55 +256,59 @@ fi
 
 export DO_NOT_COMPILE="libkscreensaver"
 
-CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -UDEBUG" \
-CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -UDEBUG" \
-./configure \
-    --prefix=%{_prefix} \
-    --with-qt-libraries=$QTDIR/lib \
-    --enable-cups \
-    --enable-mitshm \
+%configure \
     --includedir=%{_includedir}/kde \
-    --disable-debug \
-    --enable-final \
-    --sysconfdir=%{_sysconfdir} \
     --disable-rpath \
     --enable-new-ldflags \
     --disable-dependency-tracking \
-%if !%{vine3}
-    --with-alsa \
+    --disable-debug --disable-warning --enable-final \
+    --disable-fast-malloc \
+%if "%{_lib}" == "lib64"
+    --enable-libsuffix="64" \
 %endif
+    --with-qt-libraries=$QTDIR/lib \
+    --enable-cups \
+    --enable-mitshm \
+    --enable-pie \
+    --with-alsa \
+    --without-hspell \
     --disable-libfam \
     --enable-dnotify \
     --enable-inotify \
     --with-utempter \
     --with-jasper \
     --with-openexr \
+    --with-xinerama \
     --with-distribution="Vine Linux"
 
+%if %{apidocs}
+# make KDE API documentation
+  doxygen -s -u admin/Doxyfile.global
+  make %{?_smp_mflags} apidox
+%endif
+
 make %{?_smp_mflags} LDFLAGS="-L$QTDIR/lib"
 
-# make KDE API documentation
-make apidox
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export DESTDIR=$RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # create/own, see http://bugzilla.redhat.com/483318
-mkdir -p %{buildroot}%{_libdir}/kconf_update_bin
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/kconf_update_bin
 
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
-install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol
+install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/services/devices.protocol
 
+%if %{apidocs}
 pushd $RPM_BUILD_ROOT%{_docdir}
 ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
 popd
+%endif
 
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT/usr/share/doc/HTML/en
+pushd $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en
 for i in *; do
 	if [ -d $i -a -L $i/common ]; then
 		rm -f $i/common
@@ -207,16 +317,16 @@ for i in *; do
 done
 popd
 
-install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
-install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
+#install -p -m 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde.sh
+#install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde.csh
 
 # for xdg-menu
-%if !%{vine3}
-   pushd $RPM_BUILD_ROOT/etc/xdg/menus/
-      mv applications.menu kde-applications.menu
-      ln -s applications-merged kde-applications-merged
-   popd
-%endif
+#if !%{vine3}
+#   pushd $RPM_BUILD_ROOT/etc/xdg/menus/
+#      mv applications.menu kde-applications.menu
+#      ln -s applications-merged kde-applications-merged
+#   popd
+#endif
 
 # Use hicolor-icon-theme rpm/pkg instead (#178319)
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
@@ -250,8 +360,8 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
  -e "s@-lutempter@@g"
 
 # libkdnssd bits
-rm -f %{buildroot}%{_libdir}/libkdnssd.la
-%{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libkdnssd.la
+%{?libkdnssd:rm -rf $RPM_BUILD_ROOT{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
 
 # remove conflicts with kdelibs-4
 rm -f %{buildroot}%{_bindir}/checkXML
@@ -300,7 +410,7 @@ rm -f %{buildroot}%{_docdir}/HTML/en/common/xml.dcl
 rm -rf %{buildroot}%{_datadir}/locale/all_languages
 rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
 rm -rf %{buildroot}%{_datadir}/autostart/
-rm -r %{buildroot}%{_datadir}/config/colors/40.colors
+rm -f %{buildroot}%{_datadir}/config/colors/40.colors
 rm -f %{buildroot}%{_datadir}/config/colors/Rainbow.colors
 rm -f %{buildroot}%{_datadir}/config/colors/Royal.colors
 rm -f %{buildroot}%{_datadir}/config/colors/Web.colors
@@ -308,7 +418,7 @@ rm -f %{buildroot}%{_datadir}/config/ksslcalist
 rm -f %{buildroot}%{_bindir}/preparetips
 
 # don't show kresources
-sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop 
+sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," $RPM_BUILD_ROOT%{_datadir}/applications/kde/kresources.desktop 
 
 
 %clean
@@ -329,7 +439,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %files
 %defattr(-,root,root)
 %doc README COPYING.LIB
-%config(noreplace) %{_sysconfdir}/profile.d/*
+#config(noreplace) %{_sysconfdir}/profile.d/*
 %{_bindir}/artsmessage
 %{_bindir}/cupsdconf
 %{_bindir}/cupsdoprint
@@ -398,8 +508,8 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %{_datadir}/icons/crystalsvg
 %{_datadir}/locale
 %{_datadir}/mimelnk
-%{_datadir}/services
-%{_datadir}/servicetypes
+%{_datadir}/services/*
+%{_datadir}/servicetypes/*
 %ghost %{_datadir}/services/ksycoca
 %doc %{_datadir}/doc/HTML/en/common
 %doc %{_datadir}/doc/HTML/en/kspell
@@ -415,14 +525,32 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %{_libdir}/lib*.a
 %exclude %{_libdir}/libkdeinit_*.so
 
+%if %{apidocs}
 %files apidocs
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-devel-%{kde_major_version}
-%{_docdir}/HTML/en/kdelibs-apidocs
-#*
-#doc %{_datadir}/doc/HTML/en/kdelibs-apidocs
+%{_docdir}/HTML/en/kdelibs*
+%endif
 
 %changelog
+* Sat Mar 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-1
+- updated to 3.5.10 based on FC (includes the following security fixes)
+  * Mon Dec 07 2009 Than Ngo <than@redhat.com> - 3.5.10-21
+  - fix security issues in libltdl bundle within kdelibs CVE-2009-3736
+  * Mon Nov  2 2009 Lukáš Tinkl <ltinkl@redhat.com> - 3.5.10-20
+  - fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428
+  * Fri Sep 04 2009 Than Ngo <than@redhat.com> - 3.5.10-15
+  - fix for CVE-2009-2702
+  * Sun Jul 26 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-13
+  - fix CVE-2009-2537 - select length DoS
+  - fix CVE-2009-1725 - crash, possible ACE in numeric character references
+  - fix CVE-2009-1690 - crash, possible ACE in KHTML (<head> use-after-free)
+  - fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?)
+  - fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
+- moved Patch2 to Patch220, Patch20 to Patch120 
+- built with new toolchain
+- Requires: kde-settings for /etc/profile.d/kde.{sh,csh}
+
 * Sun Aug 30 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.8-3
 - renamed kdelibs3
 - split apidoc sub-package

+ 21 - 15
k/kdepim3/kdepim3-vl.spec

@@ -2,9 +2,9 @@
 %define vine4 %(grep -c 4. /etc/vine-release)
 
 Name: kdepim3
-Version: 3.5.8
-Release: 1%{?_dist_release}
 Summary: Compatibility support for kdepim3 
+Version: 3.5.10
+Release: 1%{?_dist_release}
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
 # KDE.org patches
 # KDE.gr.jp patches
@@ -14,11 +14,14 @@ Group: Applications/Productivity
 License: GPLv2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: qt-devel >= 3.3.2
+BuildRequires: bison flex
+BuildRequires: desktop-file-utils
 BuildRequires: kdelibs3-devel >= %{version}
+BuildRequires: zlib-devel
+BuildRequires: libart_lgpl-devel
 BuildRequires: cyrus-sasl-devel
-BuildRequires: libjpeg-devel libpng-devel zlib-devel
 BuildRequires: gpgme-devel
+BuildRequires: libXpm-devel libXScrnSaver-devel
 BuildRequires: libmal-devel
 BuildRequires: pilot-link-devel >= 0.9.5
 
@@ -34,7 +37,7 @@ Requires: kdelibs3 >= %{version}
 %{summary}, including libkcal.
 
 %package devel
-Summary: Development files for kdepim
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs3-devel
@@ -51,23 +54,22 @@ rm -rf kpilot doc/kpilot
 %endif
 
 %build
-export KDEDIR=%{_prefix}
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -UDEBUG" \
-CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -UDEBUG" \
-./configure  --prefix=%{_prefix} \
+%configure \
     --with-qt-libraries=$QTDIR/lib \
-    --includedir=%{_includedir}/kde \
-    --with-xinerama \
     --enable-new-ldflags \
     --disable-dependency-tracking \
-    --enable-indexlib \
-    --without-gnokii \
+    --disable-rpath \
+    --disable-debug --disable-warnings \
+    --enable-final \
+    --includedir=%{_includedir}/kde \
+    --with-gpg=%{_bindir}/gpg \
+    --with-gpgsm=%{_bindir}/gpgsm \
     --with-sasl \
+    --without-gnokii \
     --with-mal \
-    --enable-final \
-    --disable-rpath
+    --with-pilot-link
 
 for lib in ktnef libkmime libemailfunctions libkcal libkdepim; do
 make %{?_smp_mflags} -C ${lib}
@@ -121,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libkcal.so
 
 %changelog
+* Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-1
+- updated to 3.5.10
+- built with new toolchain
+
 * Sat Sep  5 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.8-2
 - renamed kdepim3
 

+ 112 - 45
k/kdewebdev/kdewebdev-vl.spec

@@ -1,33 +1,44 @@
-%define beta 0
+%define make_cvs 1
 
 Name: kdewebdev
-Version: 3.5.8
-%if %{beta}
-Release: 1%{beta}%{?_dist_release}
-%else
+Summary: Web development applications for the K Desktop Environment.
+Summary: K デスクトップ環境向け WEB 開発アプリケーション集
+Version: 3.5.10
 Release: 1%{?_dist_release}
-%endif
-Summary: KDE WebDev - WEB Development package for the K Desktop Environment.
-Summary: K デスクトップ環境向け WEB 開発パッケージ
-%if %{beta}
-Source: ftp://ftp.kde.org/pub/kde/unstable/%{version}-%{beta}/src/%{name}-%{version}-%{beta}.tar.bz2
-%else
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-%endif
-URL: http://www.kde.org/
+
+License: GPLv2
+URL: http://kdewebdev.org/
 Group: Applications/Development
-License: GPL
+
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source1: http://download.sourceforge.net/quanta/css.tar.bz2
+Source2: http://download.sourceforge.net/quanta/html.tar.bz2
+Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
+Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
+Source5: hi48-app-kxsldbg.png
+
+Patch0: javascript.patch
+Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
+Patch2: arts-acinclude.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: qt-devel >= 3.3.2
-BuildRequires: arts-devel >= 1:1.5.0
-BuildRequires: kdelibs-devel >= %{version}
-BuildRequires: libxml2-devel >= 2.6.0
+%if %{make_cvs}
+BuildRequires: automake libtool
+%endif
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: libxslt-devel >= 1.0.18
-BuildRequires: zlib-devel libjpeg-devel libpng-devel gettext
-Requires: qt >= 3.3.2
-Requires: arts >= 1:1.5.0
-Requires: kdelibs >= %{version}
+BuildRequires: libxml2-devel >= 2.6.0
+BuildRequires: perl
+
+Provides: kdewebdev3 = %{version}-%{release}
+
+Obsoletes: quanta < %{version}-%{release}
+Provides:  quanta = %{version}-%{release}
+
+%define kommander_ver 1.2.2
+#Obsoletes: kommander < %{kommander_ver}-%{release}
+Provides:  kommander = %{kommander_ver}-%{release}
 
 %description
 The kdewebdev package contains Quanta Plus and other applications, 
@@ -35,38 +46,49 @@ which are useful for web development. They are runtime dependencies
 of Quanta Plus, and it is highly recommended that you install them.
 
 The extra applications are:
+* kfilereplace: batch search and replace tool
+* kimagemapeditor: HTML image map editor
+* klinkstatus: link checker
+* kommander: visual dialog building tool
+* kxsldbg: xslt Debugger
+* quanta+: web development
 
-Kommander (a GUI script builder and executor tool) 
-KFileReplace (powerful search and replace in multiple files)
-KXSLDbg (XSL debugger)
-KImageMapEditor (image map editor)
-KLinkStatus (link validity checker)
 
 %package devel
 Summary: Development files for kdewebdev
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: kdelibs3-devel
+Provides: kdewebdev3-devel = %{version}-%{release}
 
 %description devel
 Development files for kdewebdev.
 
 %prep
-%setup -q
+%setup -q -a 1 -a 2 -a 3 -a 4
+%patch0 -p0 -b .javascript
+%patch1 -p1 -b .kxsldbg-icons
+%patch2 -p1 -b .autoconf
+
+install -m644 -p %{SOURCE5} kxsldbg/
+
+%if %{make_cvs}
+# hack/fix for newer automake
+  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
+  make -f admin/Makefile.common cvs
+%endif
+
 
 %build
-export KDEDIR=%{_prefix}
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR && . /etc/profile.d/qt.sh
 
-CFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DNDEBUG" \
-CXXFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DNDEBUG -fno-check-new" \
-./configure --prefix=%{_prefix} \
+%configure \
     --with-qt-libraries=$QTDIR/lib \
     --includedir=%{_includedir}/kde \
-    --with-xinerama \
+    --disable-rpath \
     --enable-new-ldflags \
-    --disable-dependency-tracking \
-    --enable-final \
-    --disable-rpath
+    --disable-debug --disable-warnings \
+    --disable-dependency-tracking --enable-final 
 
 make %{?_smp_mflags}
 
@@ -74,21 +96,61 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
+## package separately?  Why doesn't upstream include this? -- Rex
+# install docs
+for i in css html javascript ; do
+   pushd $i
+   ./install.sh <<EOF
+$RPM_BUILD_ROOT%{_datadir}/apps/quanta/doc
+EOF
+   popd
+   rm -rf $i
+done
+cp -a php php.docrc $RPM_BUILD_ROOT%{_datadir}/apps/quanta/doc/
+
 # Make symlinks relative
-cd $RPM_BUILD_ROOT%{?_datadir}/doc/HTML/en
+pushd $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en
 for i in *; do
-	if [ -d $i -a -L $i/common ]; then
-		rm -f $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/$i/common
-		ln -sf ../common $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/$i
-	fi
+    if [ -d $i -a -L $i/common ]; then
+	rm -f $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/$i/common
+	ln -sf ../common $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/$i
+    fi
+done
+popd
+
+# rpmdocs
+for dir in k* quanta; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
 done
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+fi
+
+%posttrans
+for f in crystalsvg hicolor locolor ; do
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -112,6 +174,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-1
+- updated to 3.5.10 based on FC
+- updated %%post and %%postun section, added %%posttrans section
+- built with new toolchain
+
 * Wed May 13 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.8-1
 - applied new versioning policy, spec in UTF-8
 - added Japanese summary