packages: marble/marble.spec - rel 2

[arekm]

Author: arekm                        Date: Wed Sep 14 07:32:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2

---- Files affected:
packages/marble:
   marble.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/marble/marble.spec
diff -u packages/marble/marble.spec:1.8 packages/marble/marble.spec:1.9
--- packages/marble/marble.spec:1.8	Fri Sep  2 19:06:27 2011
+++ packages/marble/marble.spec	Wed Sep 14 09:32:50 2011
@@ -4,13 +4,13 @@
 #
 %define         orgname     marble
 %define         _state      stable
-%define         qtver       4.7.3
+%define         qtver       4.7.4
 #
 Summary:	Marble
 Summary(pl.UTF-8):	Marble
 Name:		marble
 Version:	4.7.1
-Release:	1
+Release:	2
 License:	LGPL v2
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
@@ -37,7 +37,7 @@
 BuildRequires:	qt4-build >= %{qt_ver}
 BuildRequires:	qt4-qmake >= %{qt_ver}
 BuildRequires:	rpmbuild(macros) >= 1.293
-Obsoletes:	kde4-kdeedu-marble
+Obsoletes:	kde4-kdeedu-marble < 4.6.99
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -55,6 +55,7 @@
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	kde4-kdelibs-devel >= %{version}
+Obsoletes:	kde4-kdeedu-devel < 4.6.99
 
 %description devel
 This package contains Marble header files.
@@ -141,6 +142,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2011/09/14 07:32:50  arekm
+- rel 2
+
 Revision 1.8  2011/09/02 17:06:27  arekm
 - up to 4.7.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/marble/marble.spec?r1=1.8&r2=1.9&f=u