Author: adgor Date: Thu Oct 5 19:14:51 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - 3.5.5 .hidden
---- Files affected: SPECS: kdegames.spec (1.162 -> 1.163) , kdeedu.spec (1.100 -> 1.101) ---- Diffs: ================================================================ Index: SPECS/kdegames.spec diff -u SPECS/kdegames.spec:1.162 SPECS/kdegames.spec:1.163 --- SPECS/kdegames.spec:1.162 Sun Aug 20 00:09:43 2006 +++ SPECS/kdegames.spec Thu Oct 5 21:14:46 2006 @@ -15,15 +15,14 @@ Summary(pt_BR): K Desktop Environment - Jogos Summary(zh_CN): KDEÓÎϡ Name: kdegames -Version: 3.5.4 -Release: 1 +Version: 3.5.5 +Release: 0.1 Epoch: 8 License: GPL Group: X11/Applications/Games Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 60bb42c51c2e86a826188da457ed21d0 -Patch1: kde-common-PLD.patch -Patch2: %{name}-disable_install-exec-hook.patch +# Source0-md5: 1db8e3960ffb6af0a8d683756b89efa7 +Patch0: kde-common-PLD.patch BuildRequires: autoconf BuildRequires: automake %{?with_apidocs:BuildRequires: doxygen} @@ -31,7 +30,6 @@ BuildRequires: kdelibs-devel >= %{_minlibsevr} BuildRequires: rpmbuild(macros) >= 1.129 BuildRequires: sed >= 4.0 -#BuildRequires: unsermake Requires: kdelibs >= %{_minlibsevr} Obsoletes: kdegames-kabalone Obsoletes: kdegames-kjezz @@ -741,35 +739,8 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 -%{__sed} -i -e '/\[Desktop Entry\]/aEncoding=UTF-8' \ - klickety/klickety.desktop -%{__sed} -i -e 's/Terminal=0/Terminal=false/' \ - atlantik/atlantik.desktop \ - kasteroids/kasteroids.desktop \ - kbackgammon/kbackgammon.desktop \ - kblackbox/kblackbox.desktop \ - kbattleship/kbattleship/kbattleship.desktop \ - kgoldrunner/src/KGoldrunner.desktop \ - kjumpingcube/kjumpingcube.desktop \ - klines/klines.desktop \ - kmahjongg/kmahjongg.desktop \ - konquest/konquest.desktop \ - kpoker/kpoker.desktop \ - kreversi/kreversi.desktop \ - ksmiletris/ksmiletris.desktop \ - ksnake/ksnake.desktop \ - kspaceduel/kspaceduel.desktop \ - ksokoban/data/ksokoban.desktop \ - ktron/ktron.desktop \ - ktuberling/ktuberling.desktop \ - kwin4/kwin4.desktop \ - lskat/lskat.desktop for f in `find . -name \*.desktop`; do - if grep -q '^Categories=.*[^;]$' $f; then - sed -i -e 's/\(^Categories=.*$\)/\1;/' $f - fi if grep -q '\[ven\]' $f; then sed -i -e 's/\[ven\]/[ve]/' $f fi @@ -779,18 +750,17 @@ %build cp /usr/share/automake/config.sub admin -export UNSERMAKE=/usr/share/unsermake/unsermake %{__make} -f admin/Makefile.common cvs %configure \ - --disable-rpath \ + --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \ + %{!?debug:--disable-rpath} \ --disable-final \ %{?with_highscore:--enable-highscore-dir=/var/games} \ - --with-qt-libraries=%{_libdir} \ %if "%{_lib}" == "lib64" --enable-libsuffix=64 \ %endif - --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} + --with-qt-libraries=%{_libdir} %{__make} %{?with_apidocs:%{__make} apidox} @@ -801,8 +771,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ - kde_htmldir=%{_kdedocdir} \ - kde_libs_htmldir=%{_kdedocdir} + kde_htmldir=%{_kdedocdir} install -d $RPM_BUILD_ROOT/var/games touch $RPM_BUILD_ROOT/var/games/kbounce.scores @@ -1187,6 +1156,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.163 2006/10/05 19:14:46 adgor +- 3.5.5 .hidden + Revision 1.162 2006/08/19 22:09:43 ankry - Abalon, not Abalone in pl ================================================================ Index: SPECS/kdeedu.spec diff -u SPECS/kdeedu.spec:1.100 SPECS/kdeedu.spec:1.101 --- SPECS/kdeedu.spec:1.100 Mon Jul 31 17:57:27 2006 +++ SPECS/kdeedu.spec Thu Oct 5 21:14:46 2006 @@ -9,13 +9,13 @@ Summary: K Desktop Environment - edutainment Summary(pl): K Desktop Environment - edukacja i rozrywka Name: kdeedu -Version: 3.5.4 -Release: 1 +Version: 3.5.5 +Release: 0.1 Epoch: 8 License: GPL Group: X11/Applications/Science Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 81dfdea2ed6eaaa440ee868a69b8fc7e +# Source0-md5: 1659863d74a510bee412d0cb404b4542 Patch0: %{name}-pport.patch #Patch100: %{name}-branch.diff BuildRequires: autoconf @@ -568,20 +568,6 @@ %setup -q %patch0 -p1 -for f in `find . -name *.desktop | xargs grep -l '^Terminal=0'`; do - %{__sed} -i -e 's/^Terminal=0/Terminal=false/' $f -done -for f in `find . -name *.desktop | xargs grep -l '^Type=Application'`; do - if ! grep '^Encoding=' $f >/dev/null; then - %{__sed} -i -e '/\[Desktop Entry\]/aEncoding=UTF-8' $f - fi -done -for f in `find . -name *.desktop`; do - if grep -q '\[ven\]' $f; then - sed -i -e 's/\[ven\]/[ve]/' $f - fi -done - %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Education;Science;Chemistry;/' \ ./kalzium/src/kalzium.desktop @@ -598,27 +584,25 @@ ./keduca/resources/keduca.desktop \ ./keduca/resources/keducabuilder.desktop -for f in `find . -name \*.desktop`; do - if grep -q '^Categories=.*[^;]$' $f; then - sed -i -e 's/\(^Categories=.*$\)/\1;/' $f +for f in `find . -name *.desktop`; do + if grep -q '\[ven\]' $f; then + sed -i -e 's/\[ven\]/[ve]/' $f fi done %build cp /usr/share/automake/config.sub admin -#export UNSERMAKE=/usr/share/unsermake/unsermake - %{__make} -f admin/Makefile.common cvs %configure \ - --disable-rpath \ + --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \ + %{!?debug:--disable-rpath} \ --disable-final \ - --with-qt-libraries=%{_libdir} \ %if "%{_lib}" == "lib64" --enable-libsuffix=64 \ %endif - --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} + --with-qt-libraries=%{_libdir} %{__make} @@ -627,8 +611,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ - kde_htmldir=%{_kdedocdir} \ - kde_libs_htmldir=%{_kdedocdir} + kde_htmldir=%{_kdedocdir} install -d \ $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/actions \ @@ -648,12 +631,6 @@ %find_lang kanagram --with-kde %find_lang kgeography --with-kde -%if 0 -# Debian manpages -install -d $RPM_BUILD_ROOT%{_mandir}/man1 -install debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 -%endif - %clean rm -rf $RPM_BUILD_ROOT @@ -718,7 +695,6 @@ %{_desktopdir}/kde/kbruch.desktop %{_iconsdir}/[!l]*/*/*/kbruch* %{_kdedocdir}/en/kbruch -#%{_mandir}/man1/kbruch.1* %files keduca %defattr(644,root,root,755) @@ -733,7 +709,6 @@ %{_datadir}/services/keduca_part.desktop %{_desktopdir}/kde/keduca*.desktop %{_iconsdir}/*/*/apps/keduca.png -#%{_mandir}/man1/keduca*.1* %{_kdedocdir}/en/keduca %files kgeography -f kgeography.lang @@ -743,8 +718,6 @@ %{_desktopdir}/kde/kgeography.desktop %{_datadir}/apps/kgeography %{_iconsdir}/[!l]*/*/*/kgeography.* -#%{_iconsdir}/crystalsvg/*/*/kgeography.png -#%{_iconsdir}/crystalsvg/*/*/kgeography.svgz %files khangman %defattr(644,root,root,755) @@ -754,7 +727,6 @@ %{_datadir}/config.kcfg/khangman.kcfg %{_desktopdir}/kde/khangman.desktop %{_iconsdir}/[!l]*/*/apps/khangman* -#%{_mandir}/man1/khangman.1* %{_kdedocdir}/en/khangman %files kig @@ -782,7 +754,6 @@ %{_iconsdir}/[!l]*/*/apps/kig* %{_iconsdir}/crystalsvg/*/mimetypes/kig_doc.* %{_kdedocdir}/en/kig -#%{_mandir}/man1/kig.1* %files kiten %defattr(644,root,root,755) @@ -794,8 +765,6 @@ %{_iconsdir}/*/*/actions/kanjidic.png %{_iconsdir}/*/*/actions/edit_*.png %{_iconsdir}/*/*/apps/kiten* -#%{_mandir}/man1/kiten.1* -#%{_mandir}/man1/kitengen.1* %{_kdedocdir}/en/kiten %files klatin @@ -806,7 +775,6 @@ %{_desktopdir}/kde/klatin.desktop %{_kdedocdir}/en/klatin %{_iconsdir}/*/*/apps/klatin* -#%{_mandir}/man1/klatin.1* %files klettres %defattr(644,root,root,755) @@ -816,7 +784,6 @@ %{_datadir}/config.kcfg/klettres.kcfg %{_desktopdir}/kde/klettres.desktop %{_iconsdir}/[!l]*/*/*/klettres* -#%{_mandir}/man1/klettres.1* %{_kdedocdir}/en/klettres %if 0 @@ -827,7 +794,6 @@ %{_datadir}/config.kcfg/kmessedwords.kcfg %{_desktopdir}/kde/kmessedwords.desktop %{_iconsdir}/[!l]*/*/apps/kmessedwords* -#%{_mandir}/man1/kmessedwords.1* %{_kdedocdir}/en/kmessedwords %endif @@ -842,7 +808,6 @@ %{_datadir}/mimelnk/application/x-kmplot.desktop %{_datadir}/services/kmplot_part.desktop %{_iconsdir}/[!l]*/*/apps/kmplot* -#%{_mandir}/man1/kmplot.1* %{_kdedocdir}/en/kmplot %files kpercentage @@ -851,7 +816,6 @@ %{_datadir}/apps/kpercentage %{_desktopdir}/kde/kpercentage.desktop %{_iconsdir}/[!l]*/*/apps/kpercentage* -#%{_mandir}/man1/kpercentage.1* %{_kdedocdir}/en/kpercentage %files kstars @@ -876,19 +840,6 @@ %{_desktopdir}/kde/kstars.desktop %{_iconsdir}/[!l]*/*/apps/kstars* %{_kdedocdir}/en/kstars -%if 0 -%{_mandir}/man1/fliccd.1* -%{_mandir}/man1/kstars.1* -%{_mandir}/man1/celestrongps.1* -%{_mandir}/man1/indiserver.1* -%{_mandir}/man1/lx200_16.1* -%{_mandir}/man1/lx200autostar.1* -%{_mandir}/man1/lx200classic.1* -%{_mandir}/man1/lx200generic.1* -%{_mandir}/man1/lx200gps.1* -%{_mandir}/man1/temma.1* -%{_mandir}/man1/v4l*.1* -%endif %files ktouch %defattr(644,root,root,755) @@ -897,7 +848,6 @@ %{_datadir}/config.kcfg/ktouch.kcfg %{_desktopdir}/kde/ktouch.desktop %{_iconsdir}/*/*/apps/ktouch* -#%{_mandir}/man1/ktouch.1* %{_kdedocdir}/en/ktouch %files kturtle @@ -909,7 +859,6 @@ %{_desktopdir}/kde/kturtle.desktop %{_kdedocdir}/en/kturtle %{_iconsdir}/*/*/apps/kturtle* -#%{_mandir}/man1/kturtle.1* %files kverbos %defattr(644,root,root,755) @@ -919,7 +868,6 @@ %{_desktopdir}/kde/kverbos.desktop %{_iconsdir}/*/*/actions/kverbosuser.png %{_iconsdir}/*/*/apps/kverbos* -#%{_mandir}/man1/kverbos.1* %{_kdedocdir}/en/kverbos %files kvoctrain @@ -936,11 +884,6 @@ %{_desktopdir}/kde/kvoctrain.desktop %{_iconsdir}/*/*/apps/kvoctrain* %{_kdedocdir}/en/kvoctrain -%if 0 -%{_mandir}/man1/kvoctrain.1* -%{_mandir}/man1/langen2kvtml.1* -%{_mandir}/man1/spotlight2kvtml.1* -%endif %files kwordquiz %defattr(644,root,root,755) @@ -952,7 +895,6 @@ %{_iconsdir}/[!l]*/*/*/kwordquiz* %{_datadir}/mimelnk/application/x-kwordquiz.desktop %{_datadir}/config/kwordquizrc -#%{_mandir}/man1/kwordquiz.1* %files libextdate %defattr(644,root,root,755) @@ -960,7 +902,6 @@ %attr(755,root,root) %{_bindir}/test_extdatepicker %{_libdir}/libextdate.la %attr(755,root,root) %{_libdir}/libextdate.so.1.2.0 -#%{_mandir}/man1/test_*.1* %files libkdeeducore %defattr(644,root,root,755) @@ -988,6 +929,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.101 2006/10/05 19:14:46 adgor +- 3.5.5 .hidden + Revision 1.100 2006/07/31 15:57:27 glen - adapterized ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdegames.spec?r1=1.162&r2=1.163&f=u http://cvs.pld-linux.org/SPECS/kdeedu.spec?r1=1.100&r2=1.101&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
