rpms/kdeedu/F-7 .cvsignore, 1.30, 1.31 kdeedu.spec, 1.58, 1.59 sources, 1.33, 1.34

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5659

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
sync w/devel, kde-3.5.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-7/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	11 Jun 2007 18:35:54 -0000	1.30
+++ .cvsignore	25 Oct 2007 02:30:39 -0000	1.31
@@ -1 +1,2 @@
 kdeedu-3.5.7.tar.bz2
+kdeedu-3.5.8.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-7/kdeedu.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdeedu.spec	18 Jun 2007 16:31:39 -0000	1.58
+++ kdeedu.spec	25 Oct 2007 02:30:39 -0000	1.59
@@ -1,34 +1,42 @@
-%define rhel 0
 
 %define debug 0
-%define final 0
+%define final 1 
 %define make_cvs 0 
 
-%define kdelibs_epoch 6
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
 
-Name: kdeedu
+Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 3.5.7
-Release: 1%{?dist}
+Version: 3.5.8
+Release: 2%{?dist}
 
-License: GPL
+License: GPLv2
 Group:   Amusements/Games
 URL:     http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+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
+
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: python-devel python
 BuildRequires: boost-devel
 %if %{make_cvs}
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: automake libtool
 %endif
 
 %description
@@ -54,18 +62,27 @@
 * kwordquiz: Vocabulary Trainer
 
 %package devel
-Summary: Header files for kdeedu
+Summary: Development files for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
+Provides: kdeedu3-devel = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 %description devel
-This package contains header files for kdeedu.
+%{summary}.
+
+%if 0%{?libs}
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: kdelibs3 >= %{version}
+%description libs
+%{summary}.
+%endif
 
 
 %prep
 %setup -q
 
-%if %{rhel}
+%if 0%{?rhel} > 1
 rm -rf doc/kgeography kgeography
 perl -pi -e "s|kgeography||" subdirs
 %endif
@@ -131,20 +148,26 @@
 
 
 %post
-/sbin/ldconfig ||:
+%{!?libs:/sbin/ldconfig}
 for i in crystalsvg hicolor locolor ; do
  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
 done
-%{_bindir}/update-desktop-database >& /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
+%{!?libs:/sbin/ldconfig}
 for i in crystalsvg hicolor locolor ; do
  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
 done
-%{_bindir}/update-desktop-database >& /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
 
 
 %files -f %{name}.lang
@@ -153,6 +176,7 @@
 %doc rpmdocs/*
 %{_bindir}/*
 %{_datadir}/applications/kde/*
+# FIXME
 %{_datadir}/applnk/Edutainment/
 %{_datadir}/apps/*
 %config %{_datadir}/config*/*
@@ -162,17 +186,34 @@
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/services/*
 %{_libdir}/kde3/*
+
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
 %{_libdir}/lib*.so.*
-%{_libdir}/*.la
+%{_libdir}/lib*.la
 
 %files devel
 %defattr(-,root,root,-)
 %doc libkdeedu/AUTHORS libkdeedu/README
 %{_includedir}/kde/*
-%{_libdir}/*.so
+%{_libdir}/lib*.so
 
 
 %changelog
+* Wed Oct 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-2
+- -libs conditional (f8+)
+- %%post/%%postun libs /sbin/ldconfig
+
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-1
+- kde-3.5.8
+- License: GPLv2
+- libs subpkg (more multilib friendly)
+
+* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-2
+- respin for boost abi change
+
 * Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-1
 - 3.5.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-7/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	11 Jun 2007 18:35:54 -0000	1.33
+++ sources	25 Oct 2007 02:30:39 -0000	1.34
@@ -1 +1 @@
-e2568148df3bf5aecec2ed21c4a0e0a1  kdeedu-3.5.7.tar.bz2
+aaae4c6fe82c806eb20942178cadad9e  kdeedu-3.5.8.tar.bz2