Author: adgor                        Date: Sun Feb 20 17:58:38 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 3.3.92.050217
- NFY

---- Files affected:
SPECS:
   kdeedu.spec (1.78 -> 1.78.2.1) 

---- Diffs:

================================================================
Index: SPECS/kdeedu.spec
diff -u SPECS/kdeedu.spec:1.78 SPECS/kdeedu.spec:1.78.2.1
--- SPECS/kdeedu.spec:1.78      Wed Dec 15 00:30:46 2004
+++ SPECS/kdeedu.spec   Sun Feb 20 18:58:33 2005
@@ -1,17 +1,26 @@
 # $Revision$, $Date$
-%define                _state          stable
-%define                _ver            3.3.2
+#
+# TODO: %%files
+
+%define                _state          unstable
+%define                _ver            3.3.92
+%define                _snap           050217
+
+%define         _minlibsevr     9:3.3.92.050217                                
 
+%define         _minbaseevr     9:3.3.92.050217
 
 Summary:       K Desktop Environment - edutainment
 Summary(pl):   K Desktop Environment - edukacja i rozrywka
 Name:          kdeedu
-Version:       %{_ver}
-Release:       1
+Version:        %{_ver}.%{_snap}
+#Version:      %{_ver}
+Release:       0.1
 Epoch:         8
 License:       GPL
 Group:         X11/Applications/Science
-Source0:       
ftp://ftp.kde.org/pub/kde/%{_state}/%{_ver}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 2ea54bb7aee669582eb0877d3c6f0b3d
+Source0:        http://ftp.pld-linux.org/software/kde/%{name}-%{_snap}.tar.bz2
+#Source0:      
ftp://ftp.kde.org/pub/kde/%{_state}/%{_ver}/src/%{name}-%{version}.tar.bz2
+#%% Source0-md5:       2ea54bb7aee669582eb0877d3c6f0b3d
 Icon:          kde-edu.xpm
 Patch0:                %{name}-pport.patch
 #Patch100:     %{name}-branch.diff
@@ -22,7 +31,7 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: rpmbuild(macros) >= 1.129
-BuildRequires: unsermake >= 040805
+#BuildRequires:        unsermake >= 040805
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,33 +55,6 @@
 %description devel -l pl
 Pliki nagłówkowe bibliotek kdeedu.
 
-#%package flashkard
-#Summary:      Flash card learning tool for KDE
-#Summary(pl):  Narzędzie do nauki za pomocą pokazywania kart
-#Group:                X11/Applications/Science
-#Requires:     kdebase-core >= 9:%{version}
-#Requires:     %{name}-libkdeeducore = %{epoch}:%{version}-%{release}
-#Obsoletes:    kdeedu
-#
-#%description flashkard
-#Flash card learning tool for KDE. FlashKard is based on a rather old
-#learning method used to teach children facts. The teacher presented a
-#number of cards with questions on them, and the pupil wrote the
-#answers on the back of the cards. These cards were then checked at the
-#end of the round by the teacher. The cards with the correct answers
-#were then removed from the pile and the incorrectly-answered questions
-#were repeated over and over again, until the answer was "drilled" into
-#the pupils memory.
-#
-#%description flashkard -l pl
-#Narzędzie dla KDE do nauki za pomocą pokazywania kart. FlashKard jest
-#oparty na raczej starej metodzie nauczania dzieci faktów. Nauczyciel
-#pokazywał zestaw kart z pytaniami, a uczeń pisał odpowiedzi na
-#odwrocie tych kart. Karty były potem sprawdzane na końcu rundy przez
-#nauczyciela. Karty z poprawnymi odpowiedziami były usuwane z puli, a
-#pytania, na które padły złe odpowiedzi, były powtarzane aż do
-#wtłoczenia odpowiedzi do pamięci uczniów.
-
 %package kalzium
 Summary:       A Periodic System of Elements database
 Summary(pl):   Baza danych Układu Okresowego Pierwiastków
@@ -562,7 +544,8 @@
 aplikacje edukacyjne w KDE.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_snap}
+#%setup -q
 #%%patch100 -p1
 %patch0 -p1
 
@@ -597,8 +580,6 @@
 ./keduca/resources/keduca.desktop \
 ./keduca/resources/keducabuilder.desktop
 
-%{__sed} -i -e 's,appsdir =,#,g' \
-       -e "s,apps_DATA,xdg_apps_DATA,g"  Makefile.am
 for f in `find . -name \*.desktop`; do
        if grep -q '^Categories=.*[^;]$' $f; then
                sed -i -e 's/\(^Categories=.*$\)/\1;/' $f
@@ -607,7 +588,8 @@
 
 %build
 cp %{_datadir}/automake/config.sub admin
-export UNSERMAKE=%{_datadir}/unsermake/unsermake
+
+#export UNSERMAKE=%{_datadir}/unsermake/unsermake
 
 %{__make} -f admin/Makefile.common cvs
 
@@ -669,15 +651,6 @@
 %attr(755,root,root) %{_libdir}/libkdeeduui.so
 %{_includedir}/*.h
 
-#files flashkard
-#defattr(644,root,root,755)
-#attr(755,root,root) %{_bindir}/flashkard
-#{_datadir}/apps/flashkard
-#{_desktopdir}/kde/flashkard.desktop
-#{_iconsdir}/*/*/apps/flashkard.png
-#{_mandir}/man1/flashkard.1*
-#{_kdedocdir}/en/flashkard
-
 %files kalzium
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kalzium
@@ -720,28 +693,6 @@
 %{_iconsdir}/[!l]*/*/apps/khangman*
 %{_mandir}/man1/khangman.1*
 %{_kdedocdir}/en/khangman
-#%%{_iconsdir}/hicolor/48x48/apps/a_acute.png
-#%%{_iconsdir}/hicolor/48x48/apps/a_circle.png
-#%%{_iconsdir}/hicolor/48x48/apps/a_grave.png
-#%%{_iconsdir}/hicolor/48x48/apps/a_tilde.png
-#%%{_iconsdir}/hicolor/48x48/apps/a_umlaut.png
-#%%{_iconsdir}/hicolor/48x48/apps/a_withe.png
-#%%{_iconsdir}/hicolor/48x48/apps/c_cedil.png
-#%%{_iconsdir}/hicolor/48x48/apps/e_acute.png
-#%%{_iconsdir}/hicolor/48x48/apps/e_circ.png
-#%%{_iconsdir}/hicolor/48x48/apps/e_grave.png
-#%%{_iconsdir}/hicolor/48x48/apps/i_acute.png
-#%%{_iconsdir}/hicolor/48x48/apps/i_grave.png
-#%%{_iconsdir}/hicolor/48x48/apps/n_tilde.png
-#%%{_iconsdir}/hicolor/48x48/apps/o_acute.png
-#%%{_iconsdir}/hicolor/48x48/apps/o_circ.png
-#%%{_iconsdir}/hicolor/48x48/apps/o_cross.png
-#%%{_iconsdir}/hicolor/48x48/apps/o_grave.png
-#%%{_iconsdir}/hicolor/48x48/apps/o_tilde.png
-#%%{_iconsdir}/hicolor/48x48/apps/o_umlaut.png
-#%%{_iconsdir}/hicolor/48x48/apps/sz_lig.png
-#%%{_iconsdir}/hicolor/48x48/apps/u_acute.png
-#%%{_iconsdir}/hicolor/48x48/apps/u_umlaut.png
 
 %files kig
 %defattr(644,root,root,755)
@@ -789,7 +740,7 @@
 %{_desktopdir}/kde/klatin.desktop
 %{_kdedocdir}/en/klatin
 %{_iconsdir}/*/*/apps/klatin*
-%{_mandir}/man1/klatin.1*
+#%{_mandir}/man1/klatin.1*
 
 %files klettres
 %defattr(644,root,root,755)
@@ -799,9 +750,6 @@
 %{_datadir}/config.kcfg/klettres.kcfg
 %{_desktopdir}/kde/klettres.desktop
 %{_iconsdir}/[!l]*/*/*/klettres*
-%{_iconsdir}/*/*/apps/grownup.png
-%{_iconsdir}/*/*/apps/kids.png
-%{_iconsdir}/*/*/apps/menubar.png
 %{_mandir}/man1/klettres.1*
 %{_kdedocdir}/en/klettres
 
@@ -850,14 +798,12 @@
 %{_iconsdir}/[!l]*/*/apps/kstars*
 %{_mandir}/man1/kstars.1*
 %{_mandir}/man1/celestrongps.1*
-%{_mandir}/man1/fliccd.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/v4l*.1*
 %{_kdedocdir}/en/kstars
 
 %files ktouch
@@ -878,7 +824,6 @@
 %{_desktopdir}/kde/kturtle.desktop
 %{_kdedocdir}/en/kturtle
 %{_iconsdir}/*/*/apps/kturtle*
-%{_mandir}/man1/kturtle.1*
 
 %files kverbos
 %defattr(644,root,root,755)
@@ -913,7 +858,6 @@
 %{_kdedocdir}/en/kwordquiz
 %{_iconsdir}/[!l]*/*/*/kwordquiz*
 %{_datadir}/mimelnk/application/x-kwordquiz.desktop
-%{_mandir}/man1/kwordquiz.1*
 
 %files libkdeeducore
 %defattr(644,root,root,755)
@@ -929,7 +873,6 @@
 %defattr(644,root,root,755)
 %{_libdir}/libkdeeduui.la
 %attr(755,root,root) %{_libdir}/libkdeeduui.so.*.*.*
-%{_iconsdir}/*/*/apps/edu_*.*
 
 %files libextdate
 %defattr(644,root,root,755)
@@ -937,7 +880,6 @@
 %attr(755,root,root) %{_bindir}/test_extdatepicker
 %attr(755,root,root) %{_libdir}/libextdate.so.1.2.0
 %{_libdir}/libextdate.la
-%{_mandir}/man1/test_extdate*.1*
 
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -946,290 +888,7 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.78  2004/12/14 23:30:46  ankry
-- 3.3.2
-
-Revision 1.77  2004/11/12 22:12:30  ankry
-- ven -> ve, rel. 3
-
-Revision 1.76  2004/11/01 14:24:20  djurban
-- DLR2
-
-Revision 1.75  2004/10/31 21:46:59  djurban
--rel 1 stbr
-
-Revision 1.74  2004/10/31 21:45:13  djurban
-- %files probably ready, testing before rel. 1
-
-Revision 1.73  2004/10/31 21:03:03  djurban
-- finished update, only %files and were stbring
-
-Revision 1.72  2004/10/18 13:16:04  arekm
-- 3.1.1
-
-Revision 1.71  2004/09/21 02:43:46  ankry
-- more Categories cleaning, more visible commented packages
-
-Revision 1.70  2004/09/04 20:18:07  djurban
-- fix changelog s/rel.4/rel.3/
-
-Revision 1.69  2004/09/04 20:17:00  djurban
-- obsolete kdeedu-flashkard, rel.3
-
-Revision 1.68  2004/09/01 18:32:59  qboosh
-- -kwordquiz Obsoletes: kwordquiz, -kturtle Obsoletes: klogoturtle
-
-Revision 1.67  2004/08/31 19:22:13  snurf
-- typos / formatting / etc.
-
-Revision 1.66  2004/08/24 21:18:40  qboosh
-- added pport patch, release 2
-
-Revision 1.65  2004/08/23 11:35:46  djurban
-- ac
-
-Revision 1.64  2004/08/18 21:49:02  qboosh
-- remaining pl desc
-
-Revision 1.63  2004/08/17 20:21:08  qboosh
-- one more pl
-
-Revision 1.62  2004/08/17 12:21:46  qboosh
-- cosmetics, more pl
-
-Revision 1.61  2004/08/17 11:22:42  qboosh
-- some pl fixes
-
-Revision 1.60  2004/08/16 20:57:30  djurban
-- DONE, descriptions need translations
-
-Revision 1.59  2004/08/16 20:36:56  djurban
-- %files fixes
-
-Revision 1.58  2004/08/16 20:16:49  djurban
-- more typos, %post/un for extdate
-
-Revision 1.57  2004/08/16 11:34:57  djurban
--typo
-
-Revision 1.56  2004/08/16 11:31:48  djurban
-- more update work, klatin is back, new: kturtle,kwordquiz, libextdate,
-  still need to find what relies on libextdate
-- %files should be 99% done, rebuilding to test.
-- polish translations desperately needed, also need to %post ldconfig for
-  libextdate
-NFY
-
-Revision 1.55  2004/08/14 22:35:39  djurban
-- updated to 3.3 final, fixed vfolders and descs, merged devel, testing
-
-
-Revision 1.42.2.1  2004/04/01 16:13:25  adgor
-- My last work, due to djurban's threats
-
-Revision 1.42  2004/02/06 19:47:38  djurban
-- fix empty en dirs in i18n
-- all kde (apart from artwork/accesibility/develop/quanta) rel++ and STBR :)
-- remove apidox completely seems coolo rmoved generation from 3.2
-
-Revision 1.41  2004/02/05 16:04:28  qboosh
-- added manuals from debian dir; release 3
-
-Revision 1.40  2004/02/04 10:05:23  qboosh
-- pl cosmetics, formatting, unifications
-
-Revision 1.39  2004/02/04 01:26:40  undefine
-- fix build on amd64, release 2
-
-Revision 1.38  2004/02/03 22:48:44  djurban
-- rel. 1
-- use ftp.k.o
-- stbr
-
-Revision 1.37  2004/02/03 19:55:49  djurban
-- IIR
-
-Revision 1.36  2004/02/02 19:24:57  djurban
-- fix md5
-
-Revision 1.35  2004/02/02 16:50:37  djurban
-- updated to 3.2.0, finished i18n
-
-Revision 1.34  2004/01/27 11:40:49  qboosh
-- removed nb->no rename (follow glibc 2.3.3 change - bokmaal is nb_NO now)
-
-Revision 1.33  2004/01/11 16:35:13  djurban
-- updated :(
-
-Revision 1.32  2004/01/11 00:27:18  eothane
-- proper ep09 address
-
-Revision 1.31  2003/12/13 13:06:09  qboosh
-- added termios patch (fixes build on sparc)
-- description fixes, Obsoletes without macros, release 2
-
-Revision 1.30  2003/12/09 00:40:57  adgor
-- Merged DEVEL
-
-Revision 1.18.2.28  2003/12/06 13:40:34  adgor
-- 031204 (3.2beta2)
-
-Revision 1.18.2.27  2003/11/15 18:47:16  adgor
-- 031114
-
-Revision 1.18.2.26  2003/11/14 23:45:12  ankry
-- fixed nb -> no change
-
-Revision 1.18.2.25  2003/11/13 21:42:14  ankry
-- cosmetics, description fixes, replace sed with ed
-
-Revision 1.18.2.24  2003/11/07 00:26:17  adgor
-- 031105
-
-Revision 1.18.2.23  2003/10/26 14:14:32  adgor
-- 031024
-
-Revision 1.18.2.22  2003/10/18 23:35:01  adgor
-- 031014
-
-Revision 1.18.2.21  2003/10/08 16:49:22  djurban
-- enabling final
-
-Revision 1.18.2.20  2003/10/07 17:33:36  adgor
-- 031006
-
-Revision 1.18.2.19  2003/10/01 23:48:39  adgor
-- 030930
-- Changes whwre needed
-
-Revision 1.18.2.18  2003/09/20 13:03:26  adgor
-- 030918
-- Version 3.1.91
-- A lot of changes
-
-Revision 1.18.2.17  2003/07/28 08:09:48  adgor
-- Fixed BR
-
-Revision 1.18.2.16  2003/07/27 19:27:48  adgor
-- 030726
-
-Revision 1.18.2.15  2003/06/25 11:06:53  djurban
-- 030623
-- fixed obsoletes on kdeedu-kgeo
-
-Revision 1.18.2.14  2003/06/19 14:21:55  adgor
-- 030618
-- New versioning policy: version 3.1.90.%%{_snap}; release 1; epoch 8
-
-Revision 1.18.2.13  2003/06/15 09:58:34  adgor
-- 030613
-- Fixes where needed
-- Icon themes moved to /usr/share/icons
-
-Revision 1.18.2.12  2003/06/04 12:09:14  adgor
-- 030602
-- Updated vcategories.patch
-- Fixed src url
-
-Revision 1.18.2.11  2003/05/25 20:43:47  adgor
-- Sources md5sum
-- pld-linux.org
-
-Revision 1.18.2.10  2003/05/19 09:04:29  adgor
-- 030518
-- Fixed %%install, %%files
-
-Revision 1.18.2.9  2003/05/09 15:09:38  adgor
-- Updated to 030509 snap
-- Removed lib*.so.? files from packages
-- Added apropriate %%post/%%postun
-
-Revision 1.18.2.8  2003/05/05 13:48:24  qboosh
-- kbrunch descriptions
-
-Revision 1.18.2.7  2003/05/05 11:29:58  adgor
-- Removed main pkg
-- Fixed %%files
-- Proper req
-- Release 2
-
-Revision 1.18.2.6  2003/05/04 23:53:32  adgor
-- 030504
-- New subpkg
-- Fixed %%install; %%files
-
-Revision 1.18.2.5  2003/04/25 07:35:34  adgor
-- Updated to 030423 snap
-
-Revision 1.18.2.4  2003/04/07 00:28:57  adgor
-- Up to 030406 snap
-
-Revision 1.18.2.3  2003/04/05 12:17:32  adgor
-- Up to 030403 snap
-
-Revision 1.18.2.2  2003/04/03 08:31:08  adgor
-- Added vcategories.patch
-- Release 2
-
-Revision 1.18.2.1  2003/04/02 23:04:15  adgor
-- Up to 030329 snap
-- New subpackage, old removed
-- Updated %%install, %%files
-
-Revision 1.18  2003/03/21 16:05:45  adgor
-- It's 3.1.1 final
-- Release 1
-
-Revision 1.17  2003/03/18 10:29:13  qboosh
-- fixed regexps, BR: sed >= 4.0 (in-place edition used)
-
-Revision 1.16  2003/03/17 19:31:17  djurban
-- nb->no transition
-
-Revision 1.15  2003/03/12 19:35:06  adgor
-- Release 0.2 (rebuild with the new tarball)
-
-Revision 1.14  2003/03/10 17:30:33  adgor
-- Up to 3.1.1
-
-Revision 1.13  2003/02/14 14:34:35  qboosh
-- better khangman description and cosmetics lost on merge
-
-Revision 1.12  2003/02/11 17:10:49  adgor
-- cosmetics
-
-Revision 1.11  2003/02/10 20:54:12  misiek
-- merged from DEVEL
-
-Revision 1.5.2.5  2003/01/30 21:00:30  adgor
-- 3.1 final
-- Release 4
-
-Revision 1.5.2.4  2003/01/20 00:10:57  adgor
-- Updated to kde-3.1-rc7
-- version 3.1, release 3, epoch 7
-
-Revision 1.5.2.3  2002/12/02 01:14:00  adgor
-- Completed %files section
-- Removed unused locolor icons
-- Release 2
-
-Revision 1.5.2.2  2002/12/01 23:03:47  djurban
-- Complete mess, I only did some subpackage extension,
-  %files untouched, but it compiles now.
-
-Revision 1.5.2.1  2002/11/08 13:47:24  adgor
-- Updated to 3.0.98 (kde-3.1-rc2)
-- Release 0.1 (doesn't build)
-
-Revision 1.5  2002/11/04 18:50:52  djurban
-- Begin update to 3.0.4
-
-Revision 1.4  2002/09/07 18:56:10  kloczek
-- cosmetics.
-
-Revision 1.3  2002/09/02 01:19:11  blues
-- added obsoletes for ktouch
+Revision 1.78.2.1  2005/02/20 17:58:33  adgor
+- 3.3.92.050217
+- NFY
 
-Revision 1.2  2002/08/29 19:30:55  blues
-- merge with DEVEL
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdeedu.spec?r1=1.78&r2=1.78.2.1&f=u


_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to