rpms/kdeedu/F-11 kdeedu.spec,1.179,1.180
Rex Dieter
rdieter at fedoraproject.org
Sun Aug 9 15:46:56 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdeedu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12122
Modified Files:
kdeedu.spec
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-3
- -libs: move libavogadro-kalzium libcompoundviewer here
- new -marble-libs pkg
Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/kdeedu.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- kdeedu.spec 5 Aug 2009 02:53:21 -0000 1.179
+++ kdeedu.spec 9 Aug 2009 15:46:55 -0000 1.180
@@ -7,7 +7,7 @@
Name: kdeedu
Summary: Educational/Edutainment applications
Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
Group: Amusements/Games
@@ -92,8 +92,7 @@ Group: System Environment/Libraries
Group: Development/Libraries
Summary: Developer files for %{name}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# libmarble
-Requires: %{name}-marble%{?_isa} = %{version}-%{release}
+Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
Obsoletes: kdeedu4-devel < %{version}-%{release}
Provides: kdeedu4-devel = %{version}-%{release}
# http://bugzilla.redhat.com/394011
@@ -114,12 +113,12 @@ Requires: %{name}-libs%{?_isa} = %{versi
%package marble
Summary: A World Atlas
Group: Amusements/Games
+Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
+# multilib, when marble-libs was introduced
+Obsoletes: %{name}-marble < 4.3.0-3
%if 0%{?fedora} < 11
# http://bugzilla.redhat.com/487550
Conflicts: kdeedu-libs < 4.2.0
-# this should avoid conflict too, even though kdeedu-libs isn't
-# strictly required.
-#Requires: %{name}-libs = %{version}-%{release}
%endif
# http://bugzilla.redhat.com/394011
Obsoletes: marble < 1:0.5.1-1
@@ -127,6 +126,13 @@ Provides: marble = 1:0.7-%{release}
%description marble
%{summary}.
+%package marble-libs
+Summary: Runtime libraries for marble
+Group: System Environment/Libraries
+Requires: %{name}-marble = %{version}-%{release}
+%description marble-libs
+%{summary}.
+
%package math
Group: Amusements/Games
Summary: Math applications
@@ -297,8 +303,6 @@ rm -rf %{buildroot}
# kalzium
%{_kde4_libdir}/avogadro-kalzium/
-%{_kde4_libdir}/libavogadro-kalzium.so.*
-%{_kde4_libdir}/libcompoundviewer.so.*
%{_kde4_datadir}/applications/kde4/blinken.desktop
%{_kde4_datadir}/applications/kde4/kalzium.desktop
@@ -369,10 +373,12 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%doc COPYING README
%{_kde4_appsdir}/libkdeedu/
-%{_kde4_libdir}/libkdeedu*.so.*
-%{_kde4_libdir}/libkeduvocdocument.so.*
-%{_kde4_libdir}/libkiten.so.*
-%{_kde4_libdir}/libscience.so.*
+%{_kde4_libdir}/libavogadro-kalzium.so.0*
+%{_kde4_libdir}/libcompoundviewer.so.4*
+%{_kde4_libdir}/libkdeeduui.so.4*
+%{_kde4_libdir}/libkeduvocdocument.so.4*
+%{_kde4_libdir}/libkiten.so.4*
+%{_kde4_libdir}/libscience.so.4*
# needed here for multilib'd runtime
%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
@@ -460,6 +466,10 @@ rm -rf %{buildroot}
%changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-3
+- -libs: move libavogadro-kalzium libcompoundviewer here
+- new -marble-libs pkg
+
* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
- move kalziumuiwidgets.so designer plugin to -libs
- tighten -libs deps using %%?_isa
More information about the fedora-extras-commits
mailing list