From 11c220fd51a1f79b3f05e5937f7d7879653a43a3 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Nov 20 2008 14:11:40 +0000 Subject: 4.2 beta 1 --- diff --git a/.cvsignore b/.cvsignore index 15181f9..b1b5474 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ kdeedu-4.1.2.tar.bz2 +kdeedu-4.1.80.tar.bz2 diff --git a/kdeedu-4.0.4-cfitsio.patch b/kdeedu-4.0.4-cfitsio.patch deleted file mode 100644 index 466a642..0000000 --- a/kdeedu-4.0.4-cfitsio.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up kdeedu-4.0.4/cmake/modules/FindCFitsio.cmake.cfitsio kdeedu-4.0.4/cmake/modules/FindCFitsio.cmake ---- kdeedu-4.0.4/cmake/modules/FindCFitsio.cmake.cfitsio 2008-01-04 17:56:03.000000000 -0600 -+++ kdeedu-4.0.4/cmake/modules/FindCFitsio.cmake 2008-05-07 14:36:53.000000000 -0500 -@@ -20,13 +20,22 @@ if (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBR - - else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES) - -+ IF (NOT WIN32) -+ # use pkg-config to get the directories and then use these values -+ # in the FIND_PATH() and FIND_LIBRARY() calls -+ INCLUDE(UsePkgConfig) -+ PKGCONFIG(cfitsio _CFitsioIncDir _CFitsioLinkDir _CFitsioLinkFlags _CFitsioCflags) -+ ENDIF (NOT WIN32) -+ - find_path(CFITSIO_INCLUDE_DIR fitsio.h -+ ${_CFitsioIncDir} - ${_obIncDir} - ${GNUWIN32_DIR}/include - ) - - find_library(CFITSIO_LIBRARIES NAMES cfitsio - PATHS -+ ${_CFitsioLinkDir} - ${_obLinkDir} - ${GNUWIN32_DIR}/lib - ) diff --git a/kdeedu.spec b/kdeedu.spec index 358fd14..0b7a62e 100644 --- a/kdeedu.spec +++ b/kdeedu.spec @@ -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 @@ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar 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 @@ Provides: kdeedu4 = %{version}-%{release} 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: gpsd-devel 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: openbabel-devel >= 2.2.0-0.4.b5 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 @@ -85,10 +83,10 @@ Educational/Edutainment applications: * 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 @@ Group: System Environment/Libraries %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 @@ Requires: pcre-devel %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 @@ make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 %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 hicolor 2> /dev/null || : 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 @@ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : %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 @@ rm -rf %{buildroot} %{_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 @@ rm -rf %{buildroot} # marble %{_kde4_libdir}/libcompoundviewer.so.* -%files libs +%files libs %defattr(-,root,root,-) %doc COPYING README %{_kde4_libdir}/libanalitza.so.* @@ -356,7 +359,6 @@ rm -rf %{buildroot} %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 @@ rm -rf %{buildroot} %{_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 @@ rm -rf %{buildroot} %{_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 @@ rm -rf %{buildroot} %changelog +* Thu Nov 20 2008 Than Ngo 4.1.80-2 +- merged + +* Fri Nov 21 2008 Lorenzo Villani - 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 4.1.3-1 +- KDE 4.1.3 + * Mon Sep 29 2008 Rex Dieter 4.1.2-2 - make VERBOSE=1 - respin against new(er) kde-filesystem @@ -531,7 +542,7 @@ rm -rf %{buildroot} - kde-3.96.0 * Fri Nov 09 2007 Rex Dieter 3.95.2-1 -- kdeedu-3.95.2 +- kdeedu-3.95.2 - resume ppc, ppc64 builds (#370771) * Wed Nov 07 2007 Rex Dieter 3.95.0-4 @@ -601,7 +612,7 @@ rm -rf %{buildroot} * Tue Feb 07 2006 Jesse Keating - 3.5.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes -* Sat Feb 04 2006 Than Ngo 3.5.1-1 +* Sat Feb 04 2006 Than Ngo 3.5.1-1 - 3.5.1 * Fri Dec 09 2005 Jesse Keating @@ -611,7 +622,7 @@ rm -rf %{buildroot} - 3.5 final * Fri Nov 11 2005 Than Ngo 3.4.92-2 -- fix #172887 +- fix #172887 * Tue Oct 25 2005 Than Ngo 3.4.92-1 - update to 3.5 beta2 @@ -641,7 +652,7 @@ rm -rf %{buildroot} * Fri Mar 04 2005 Than Ngo 3.4.0-0.rc1.2 - rebuilt against gcc-4.0.0-0.31 -* Tue Mar 01 2005 Than Ngo 3.4.0-0.rc1.1 +* Tue Mar 01 2005 Than Ngo 3.4.0-0.rc1.1 - 3.4.0 rc1 * Wed Feb 16 2005 Than Ngo 3.3.92-0.1 @@ -776,7 +787,7 @@ rm -rf %{buildroot} * Fri Aug 9 2002 Than Ngo 3.0.2-3 - desktop file issues - fixed a bug in install (bug #69414) - + * Tue Jul 23 2002 Tim Powers 3.0.2-2 - build using gcc-3.2-0.1 diff --git a/sources b/sources index b82a95e..3ae9670 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7319ea65180451d1ecfed158714a4fd3 kdeedu-4.1.2.tar.bz2 +1532cc5ec3962ae462f2dc56db17fec9 kdeedu-4.1.80.tar.bz2