rpms/kdeedu/devel .cvsignore, 1.31, 1.32 kdeedu.spec, 1.61, 1.62 sources, 1.34, 1.35

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7168

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
* Wed Oct 31 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.94.0-1
- kdeedu-3.94 (kde-4-beta3)
- drop multilib hacks



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	13 Oct 2007 18:04:46 -0000	1.31
+++ .cvsignore	2 Nov 2007 13:16:58 -0000	1.32
@@ -1,2 +1 @@
-kdeedu-3.5.7.tar.bz2
-kdeedu-3.5.8.tar.bz2
+kdeedu-3.94.0.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kdeedu.spec	25 Oct 2007 20:03:24 -0000	1.61
+++ kdeedu.spec	2 Nov 2007 13:16:58 -0000	1.62
@@ -1,211 +1,155 @@
 
-%define debug 0
-%define final 1 
-%define make_cvs 0 
-
-%if 0%{?fedora} > 7
-# make -libs subpkg
-%define libs 1
-%endif
 
 Name:    kdeedu
-Summary: Educational/Edutainment applications
-Version: 3.5.8
-Release: 3%{?dist}
+Summary: Educational/Edutainment applications 
+Version: 3.94.0
+Release: 1%{?dist}
 
 License: GPLv2
-Group:   Amusements/Games
+Group:	 Amusements/Games
 URL:     http://www.kde.org/
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
-Provides: kdeedu3 = %{version}-%{release}
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%if 0%{?libs}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
+Obsoletes: kdeedu4 < %{version}-%{release}
+Provides:  kdeedu4 = %{version}-%{release}
 
+# Kig can optionally use Boost.Python for Python scripting
+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: kdelibs3-devel >= %{version}
+BuildRequires: giflib-devel
+BuildRequires: kdelibs4-devel >= %{version}
+# for macros.kde4
+BuildRequires: kde-filesystem
+BuildRequires: libusb-devel
+# OCaml is needed by Kalzium <http://caml.inria.fr/>
+BuildRequires: ocaml
+# FIXME: build fails with openbabel-devel installed -- Rex
+#BuildRequires: openbabel-devel
+BuildRequires: pcre-devel
 BuildRequires: python-devel python
-BuildRequires: boost-devel
-%if %{make_cvs}
-BuildRequires: automake libtool
-%endif
+BuildRequires: readline-devel
+## BR's FIXME/TODO:
+#+ LibFacile: libfacile is needed by Kalzium <http://www.recherche.enac.fr/log/facile/>
+#+ Eigen, 1.0.5: Eigen is needed by Kalzium <http://eigen.tuxfamily.org>
+#+ libsbigudrv, 1.00: SBIG Universal Driver is needed by KStars <http://indi.sourceforge.net/>
+
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 
 %description
-Educational/Edutainment applications, including:
+Educational/Edutainment applications:
 * blinken: Simon Says Game
-* kalzium: Periodic Table of Elements
-* kanagram: Letter Order Game
+* kalgebra: MathML-based graph calculator
 * kbruch: Exercise Fractions
-* keduca: Tests and Exams
 * kgeography: Geography Trainer
 * khangman: Hangman Game
 * kig: Interactive Geometry
 * kiten: Japanese Reference/Study Tool
-* klatin: Latin Reviser
 * klettres: French alphabet tutor
 * kmplot: Mathematical Function Plotter
 * kpercentage: Excersie Percentages
 * kstars: Desktop Planetarium
 * ktouch: Touch Typing Tutor
 * kturtle: Logo Programming Environment
-* kverbos: Study Spanish Verbforms
 * kvoctrain: Vocabulary Trainer
 * kwordquiz: Vocabulary Trainer
+* marble: Virtual Globe
 
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Provides: kdeedu3-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-%description devel
-%{summary}.
-
-%if 0%{?libs}
 %package libs
-Summary: %{name} runtime libraries
+Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: kdelibs3 >= %{version}
-# helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
-%endif
+
+%package devel
+Group:    Development/Libraries
+Summary:  Developer files for %{name} 
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kdeedu4-devel < %{version}-%{release}
+Provides:  kdeedu4-devel = %{version}-%{release}
+Requires: kdelibs4-devel
+Requires: giflib-devel
+Requires: pcre-devel
+%description devel
+%{name}.
 
 
 %prep
-%setup -q
-
-%if 0%{?rhel} > 1
-rm -rf doc/kgeography kgeography
-perl -pi -e "s|kgeography||" subdirs
-%endif
-
-%if %{make_cvs}
-  make -f admin/Makefile.common cvs
-%endif
+%setup -q -n kdeedu-%{version}
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --enable-kig-python-scripting \
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
-   --includedir=%{_includedir}/kde
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot}
-
-# locale's
-%find_lang %{name} || touch %{name}.lang
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# rpmdocs
-for dir in blinken k* ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
-
-%clean
-rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %post
-%{!?libs:/sbin/ldconfig}
-for i in crystalsvg hicolor locolor ; do
- touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database >& /dev/null ||:
-
-%postun
-%{!?libs:/sbin/ldconfig}
-for i in crystalsvg hicolor locolor ; do
- touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database >& /dev/null ||:
+xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%postun 
+xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
-%endif
 
 
-%files -f %{name}.lang
+%clean
+rm -rf %{buildroot}
+
+
+%files
 %defattr(-,root,root,-)
-%doc README COPYING
-%doc rpmdocs/*
-%{_bindir}/*
-%{_datadir}/applications/kde/*
-# FIXME
-%{_datadir}/applnk/Edutainment/
-%{_datadir}/apps/*
-%config %{_datadir}/config*/*
-%{_datadir}/mimelnk/*/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/services/*
-%{_libdir}/kde3/*
+%doc COPYING README
+%{_kde4_bindir}/*
+%{_kde4_appsdir}/*
+%{_kde4_configdir}/*
+%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/config.kcfg/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_docdir}/HTML/en/*
+%{_kde4_iconsdir}/crystalsvg/*/*/*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/kde4/*
+%{_datadir}/dbus-1/interfaces/*
 
-%if 0%{?libs}
-%files libs
+%files libs 
 %defattr(-,root,root,-)
-%endif
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
+%{_kde4_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc libkdeedu/AUTHORS libkdeedu/README
-%{_includedir}/kde/*
-%{_libdir}/lib*.so
+%{_kde4_includedir}/*
+%{_kde4_libdir}/lib*.so
+%{_kde4_libdir}/libhtmesh.a
 
 
 %changelog
+* Wed Oct 31 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.94.0-1
+- kdeedu-3.94 (kde-4-beta3)
+- drop multilib hacks
+
 * Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-3
 - -libs: Obsoletes: %%name ... to help out multilib upgrades
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	13 Oct 2007 18:04:46 -0000	1.34
+++ sources	2 Nov 2007 13:16:58 -0000	1.35
@@ -1 +1 @@
-aaae4c6fe82c806eb20942178cadad9e  kdeedu-3.5.8.tar.bz2
+31ed8ba5b5b56f8257576fbf85e8db92  kdeedu-3.94.0.tar.bz2