rpms/kdeedu/devel .cvsignore, 1.53, 1.54 kdeedu.spec, 1.132, 1.133 sources, 1.57, 1.58 kdeedu-4.0.4-cfitsio.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv523

Modified Files:
	.cvsignore kdeedu.spec sources 
Removed Files:
	kdeedu-4.0.4-cfitsio.patch 
Log Message:
4.2 beta 1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	27 Sep 2008 02:25:15 -0000	1.53
+++ .cvsignore	20 Nov 2008 14:11:40 -0000	1.54
@@ -1 +1,2 @@
 kdeedu-4.1.2.tar.bz2
+kdeedu-4.1.80.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- kdeedu.spec	29 Sep 2008 16:31:58 -0000	1.132
+++ kdeedu.spec	20 Nov 2008 14:11:40 -0000	1.133
@@ -12,8 +12,8 @@
 %endif
 
 Name:    kdeedu
-Summary: Educational/Edutainment applications 
-Version: 4.1.2
+Summary: Educational/Edutainment applications
+Version: 4.1.80
 Release: 2%{?dist}
 
 License: GPLv2
@@ -23,7 +23,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # fix cfitsio detection by using pkgconfig
-Patch0:  kdeedu-4.0.4-cfitsio.patch
+Patch0:  kdeedu-4.1.72-cfitsio.patch
 
 # http://bugzilla.redhat.com/371121
 Obsoletes: kalgebra < 1:0.7-7
@@ -40,7 +40,6 @@
 BuildRequires: boost-devel
 # CFITSIO Library is needed by KStars for many INDI drivers & for KStars FITS Viewer.
 BuildRequires: cfitsio-devel
-BuildRequires: cmake 
 BuildRequires: desktop-file-utils
 BuildRequires: eigen-devel
 BuildRequires: giflib-devel
@@ -49,9 +48,7 @@
 BuildRequires: gsl-devel
 # for libplasma
 BuildRequires: kdebase-workspace-devel >= %{version}
-BuildRequires: kdelibs4-devel >= %{version}
 # for macros.kde4
-BuildRequires: kde-filesystem
 BuildRequires: libnova-devel
 BuildRequires: libqalculate-devel
 BuildRequires: libusb-devel
@@ -65,6 +62,7 @@
 BuildRequires: pcre-devel
 BuildRequires: python-devel python
 BuildRequires: readline-devel
+BuildRequires: python-devel
 ## BR's FIXME/TODO:
 #+ libsbigudrv, 1.00: SBIG Universal Driver is needed by KStars <http://indi.sourceforge.net/>
 
@@ -85,10 +83,10 @@
 * khangman: Hangman Game
 * kiten: Japanese Reference/Study Tool
 * klettres: French alphabet tutor
-* ktouch: Learn and practice touch typing 
+* ktouch: Learn and practice touch typing
 * kturtle: Logo Programming Environment
 * kwordquiz: Flashcard and vocabulary learning
-* marble: A World Atlas 
+* marble: A World Atlas
 * parley: Vocabulary Trainer
 * step: Interactive physical simulator
 
@@ -100,7 +98,7 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Developer files for %{name} 
+Summary:  Developer files for %{name}
 Requires: %{name}-libs = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
@@ -115,7 +113,7 @@
 
 %package kstars
 Group:   Amusements/Games
-Summary: Desktop Planetarium 
+Summary: Desktop Planetarium
 Requires: %{name}-libs = %{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
@@ -156,7 +154,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # #unpackaged files
 # omit stuff for which there isn't a clear public API
@@ -168,7 +166,7 @@
 xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%postun 
+%postun
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
@@ -183,10 +181,10 @@
 %postun kstars
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
-%post math 
+%post math
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
-%postun math 
+%postun math
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
@@ -238,11 +236,16 @@
 %{_kde4_datadir}/kde4/services/marble_part.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-parley.desktop
 %{_kde4_datadir}/kde4/services/plasma_parley.desktop
+%{_kde4_datadir}/kde4/services/plasma-dataengine-kalzium.desktop
+%{_kde4_datadir}/kde4/services/plasma_didyouknow.desktop
 
 %{_kde4_libdir}/kde4/libmarble_part.so
 %{_kde4_libdir}/kde4/plasma_applet_kalgebra.so
 %{_kde4_libdir}/kde4/plasma_applet_parley.so
 %{_kde4_libdir}/kde4/plasma_engine_parley.so
+%{_kde4_libdir}/kde4/plasma_applet_didyouknow.so
+%{_kde4_libdir}/kde4/plasma_engine_kalzium.so
+
 %{_kde4_datadir}/applications/kde4/blinken.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
 %{_kde4_datadir}/applications/kde4/kanagram.desktop
@@ -312,7 +315,7 @@
 # marble
 %{_kde4_libdir}/libcompoundviewer.so.*
 
-%files libs 
+%files libs
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_libdir}/libanalitza.so.*
@@ -356,7 +359,6 @@
 %doc COPYING README
 %{_kde4_bindir}/calgebra
 %{_kde4_bindir}/kalgebra
-%{_kde4_bindir}/kbruch
 %{_kde4_bindir}/kig
 %{_kde4_bindir}/kmplot
 %{_kde4_bindir}/kpercentage
@@ -364,11 +366,9 @@
 %{_kde4_libdir}/kde4/kigpart.*
 %{_kde4_libdir}/kde4/libkmplotpart.*
 %{_kde4_datadir}/applications/kde4/kalgebra.desktop
-%{_kde4_datadir}/applications/kde4/kbruch.desktop
 %{_kde4_datadir}/applications/kde4/kig.desktop
 %{_kde4_datadir}/applications/kde4/kmplot.desktop
 %{_kde4_datadir}/applications/kde4/kpercentage.desktop
-%{_kde4_datadir}/config.kcfg/kbruch.kcfg
 %{_kde4_datadir}/config.kcfg/kmplot.kcfg
 %{_datadir}/dbus-1/interfaces/org.kde.kmplot.*
 %{_kde4_docdir}/HTML/en/kpercentage/
@@ -377,13 +377,11 @@
 %{_kde4_docdir}/HTML/en/kig/
 %{_kde4_docdir}/HTML/en/kmplot/
 %{_kde4_iconsdir}/hicolor/*/*/kalgebra.*
-%{_kde4_iconsdir}/hicolor/*/*/kbruch.*
 %{_kde4_iconsdir}/hicolor/*/*/kig.*
 %{_kde4_iconsdir}/hicolor/*/*/kmplot.*
 %{_kde4_iconsdir}/hicolor/*/*/kpercentage.*
 %{_kde4_iconsdir}/hicolor/*/*/application-x-kig.*
 %{_kde4_appsdir}/katepart/syntax/python-kig.xml
-%{_kde4_appsdir}/kbruch/
 %{_kde4_appsdir}/kig/
 %{_kde4_appsdir}/kmplot/
 %{_kde4_appsdir}/kpercentage/
@@ -393,6 +391,19 @@
 
 
 %changelog
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Fri Nov 21 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake 2.6.2
+- BR python-devel
+- make install/fast
+- drop kbruch and related files from filelists
+
+* Mon Nov 10 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.3-1
+- KDE 4.1.3
+
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - make VERBOSE=1
 - respin against new(er) kde-filesystem
@@ -531,7 +542,7 @@
 - kde-3.96.0
 
 * Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.95.2-1
-- kdeedu-3.95.2 
+- kdeedu-3.95.2
 - resume ppc, ppc64 builds (#370771)
 
 * Wed Nov 07 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.95.0-4
@@ -601,7 +612,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Sat Feb 04 2006 Than Ngo <than at redhat.com> 3.5.1-1 
+* Sat Feb 04 2006 Than Ngo <than at redhat.com> 3.5.1-1
 - 3.5.1
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
@@ -611,7 +622,7 @@
 - 3.5 final
 
 * Fri Nov 11 2005 Than Ngo <than at redhat.com> 3.4.92-2
-- fix #172887 
+- fix #172887
 
 * Tue Oct 25 2005 Than Ngo <than at redhat.com> 3.4.92-1
 - update to 3.5 beta2
@@ -641,7 +652,7 @@
 * Fri Mar 04 2005 Than Ngo <than at redhat.com> 3.4.0-0.rc1.2
 - rebuilt against gcc-4.0.0-0.31
 
-* Tue Mar 01 2005 Than Ngo <than at redhat.com> 3.4.0-0.rc1.1 
+* Tue Mar 01 2005 Than Ngo <than at redhat.com> 3.4.0-0.rc1.1
 - 3.4.0 rc1
 
 * Wed Feb 16 2005 Than Ngo <than at redhat.com> 3.3.92-0.1
@@ -776,7 +787,7 @@
 * Fri Aug  9 2002 Than Ngo <than at redhat.com> 3.0.2-3
 - desktop file issues
 - fixed a bug in install (bug #69414)
- 
+
 * Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.2-2
 - build using gcc-3.2-0.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	27 Sep 2008 02:25:15 -0000	1.57
+++ sources	20 Nov 2008 14:11:40 -0000	1.58
@@ -1 +1 @@
-7319ea65180451d1ecfed158714a4fd3  kdeedu-4.1.2.tar.bz2
+1532cc5ec3962ae462f2dc56db17fec9  kdeedu-4.1.80.tar.bz2


--- kdeedu-4.0.4-cfitsio.patch DELETED ---