rpms/kdeedu/devel kdeedu.spec,1.202,1.203
Rex Dieter
rdieter at fedoraproject.org
Sun Aug 23 18:47:46 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11608
Modified Files:
kdeedu.spec
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-6
- -kstars-libs subpkg, make -kstars not multilib'd
Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- kdeedu.spec 20 Aug 2009 13:26:04 -0000 1.202
+++ kdeedu.spec 23 Aug 2009 18:47:46 -0000 1.203
@@ -7,7 +7,7 @@
Name: kdeedu
Summary: Educational/Edutainment applications
Version: 4.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
Group: Amusements/Games
@@ -47,7 +47,6 @@ BuildRequires: python-devel python
BuildRequires: readline-devel
BuildRequires: xplanet
-
## BR's FIXME/TODO:
#-- The following OPTIONAL packages could NOT be located on your system.
#+ Experimental Python binding support for the Marble library: Experimental Python binding support for the Marble library <http://techbase.kde.org/Development/Languages/Python>
@@ -57,11 +56,10 @@ BuildRequires: xplanet
# help multilib upgrades
Obsoletes: kdeedu < 4.3.0-3
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# split pkgs, (temporary?) upgrade path -- Rex
-Requires: %{name}-kstars = %{version}-%{release}
%if 0%{?fedora} < 12
Requires: %{name}-marble = %{version}-%{release}
Requires: %{name}-math = %{version}-%{release}
+Requires: %{name}-kstars = %{version}-%{release}
%endif
# blinken
Requires: sj-stevehand-fonts
@@ -107,11 +105,21 @@ Requires: kdelibs4-devel
%package kstars
Group: Amusements/Games
Summary: Desktop Planetarium
+# help multilib upgrades
+Obsoletes: kdeedu-kstars < 4.3.0-6
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-kstars-libs%{?_isa} = %{version}-%{release}
#Requires(hint): xplanet
%description kstars
%{summary}.
+%package kstars-libs
+Summary: Runtime libraries for kstars
+Group: System Environment/Libraries
+Requires: %{name}-kstars = %{version}-%{release}
+%description kstars-libs
+%{summary}.
+
%package marble
Summary: A World Atlas
Group: Amusements/Games
@@ -404,6 +412,9 @@ rm -rf %{buildroot}
%{_kde4_docdir}/HTML/en/kstars/
%{_kde4_appsdir}/kstars/
%{_kde4_iconsdir}/hicolor/*/*/kstars.*
+
+%files kstars-libs
+%defattr(-,root,root,-)
%{_kde4_libdir}/libSatLib.so.*
%files marble
@@ -469,6 +480,9 @@ rm -rf %{buildroot}
%changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-6
+- -kstars-libs subpkg, make -kstars not multilib'd
+
* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
- add Obsoletes to help multilib upgrades
- -marble-libs: move marble plugins here
More information about the fedora-extras-commits
mailing list