rpms/kdeedu/FC-5 kdeedu.spec,1.46,1.47 sources,1.30,1.31

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdeedu/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9094

Modified Files:
	kdeedu.spec sources 
Log Message:
3.5.4



Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-5/kdeedu.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdeedu.spec	10 Jun 2006 12:59:25 -0000	1.46
+++ kdeedu.spec	14 Aug 2006 11:26:35 -0000	1.47
@@ -2,31 +2,36 @@
 %define final 0
 %define make_cvs 1
 
-%define arts 1
-
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_epoch 1
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Name: kdeedu
-Version: 3.5.3
+Version: 3.5.4
 Release: 0.1.fc5
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch1: kde-libtool.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: qt >= %{qt_epoch}:%{qt_version}
-Requires(post,postun): /sbin/ldconfig
-
-BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+
+BuildRequires: kdebase-devel
+BuildRequires: perl
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: gettext
 BuildRequires: python-devel
 BuildRequires: boost-devel
 
@@ -46,8 +51,6 @@
 Provides: ktouch
 Provides: kvoctrain
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 %description
 Educational/Edutainment applications for KDE
 
@@ -59,55 +62,6 @@
 %description devel
 This package contains header files for kdeedu.
 
-%package -n keduca
-Summary: Tests and Exams
-Group: User Interface/Desktops
-
-%description -n keduca
-Tests and Exams
-
-%package -n kig
-Summary: Interactive Geometry
-Group: User Interface/Desktops
-
-%description -n kig
-Interactive Geometry
-
-%package -n klettres
-Summary: French alphabet tutor
-Group: User Interface/Desktops
-
-%description -n klettres
-French alphabet tutor
-
-%package -n kmessedwords
-Summary: Letter Order Game
-Group: User Interface/Desktops
-
-%description -n kmessedwords
-Letter Order Game
-
-%package -n kstars
-Summary: Desktop Planetarium
-Group: User Interface/Desktops
-
-%description -n kstars
-Desktop Planetarium
-
-%package -n ktouch
-Summary: Touch Typing Tutor
-Group: User Interface/Desktops
-
-%description -n ktouch
-Touch Typing Tutor
-
-%package -n kvoctrain
-Summary: Vocabulary Trainer
-Group: User Interface/Desktops
-
-%description -n kvoctrain
-Vocabulary Trainer
-
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
@@ -129,12 +83,7 @@
    --disable-dependency-tracking \
    --disable-rpath \
    --enable-kig-python-scripting \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -158,16 +107,16 @@
 %post
 /sbin/ldconfig
 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 ||:
+  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 || :
 
 %postun
 /sbin/ldconfig
 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 ||:
+  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 || :
 
@@ -196,6 +145,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 3.5.4-0.1.fc5
+- 3.5.4
+
 * Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
 - update to 3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	10 Jun 2006 12:59:25 -0000	1.30
+++ sources	14 Aug 2006 11:26:35 -0000	1.31
@@ -1 +1 @@
-5c9cb7f25c8627772d6de5a3ed550691  kdeedu-3.5.3.tar.bz2
+81dfdea2ed6eaaa440ee868a69b8fc7e  kdeedu-3.5.4.tar.bz2