rpms/kdeedu/devel kdeedu.spec,1.59,1.60

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdeedu.spec 
Log Message:
* Wed Oct 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-2
- -libs conditional (f8+)
- %post/%postun libs /sbin/ldconfig



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdeedu.spec	13 Oct 2007 18:04:46 -0000	1.59
+++ kdeedu.spec	25 Oct 2007 02:25:38 -0000	1.60
@@ -3,10 +3,15 @@
 %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: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
@@ -19,6 +24,13 @@
 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: kdelibs3-devel >= %{version}
 BuildRequires: python-devel python
@@ -57,12 +69,14 @@
 %description devel
 %{summary}.
 
+%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs3 >= %{version}
 %description libs
 %{summary}.
+%endif
 
 
 %prep
@@ -103,16 +117,6 @@
 
 make install DESTDIR=%{buildroot}
 
-desktop-file-install \
-  --vendor="" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
-  --add-category="Qt" \
-  --add-category="KDE" \
-  --add-category="Education" \
-  --add-category="X-KDE-Edu-Language" \
-  --delete-original \
-  %{buildroot}%{_datadir}/applnk/Edutainment/*/kwordquiz.desktop
-
 # locale's
 %find_lang %{name} || touch %{name}.lang
 HTML_DIR=$(kde-config --expandvars --install html)
@@ -144,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
@@ -177,8 +187,10 @@
 %{_datadir}/services/*
 %{_libdir}/kde3/*
 
+%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
+%endif
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
 
@@ -190,6 +202,10 @@
 
 
 %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