packages: kde4-marble/kde4-marble.spec - now as kde4-marble

[arekm]

Author: arekm                        Date: Sat Jan 21 20:36:49 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- now as kde4-marble

---- Files affected:
packages/kde4-marble:
   kde4-marble.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/kde4-marble/kde4-marble.spec
diff -u packages/kde4-marble/kde4-marble.spec:1.16 packages/kde4-marble/kde4-marble.spec:1.17
--- packages/kde4-marble/kde4-marble.spec:1.16	Thu Jan 19 09:52:38 2012
+++ packages/kde4-marble/kde4-marble.spec	Sat Jan 21 21:36:44 2012
@@ -8,7 +8,7 @@
 #
 Summary:	Marble
 Summary(pl.UTF-8):	Marble
-Name:		marble
+Name:		kde4-marble
 Version:	4.8.0
 Release:	1
 License:	LGPL v2
@@ -38,6 +38,7 @@
 BuildRequires:	qt4-qmake >= %{qt_ver}
 BuildRequires:	rpmbuild(macros) >= 1.293
 Obsoletes:	kde4-kdeedu-marble < 4.6.99
+Obsoletes:	marble < 4.8.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -56,6 +57,7 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	kde4-kdelibs-devel >= %{version}
 Obsoletes:	kde4-kdeedu-devel < 4.6.99
+Obsoletes:	marble-devel < 4.8.0
 
 %description devel
 This package contains Marble header files.
@@ -64,7 +66,7 @@
 Pakiet zawiera pliki nagłówkowe dla Marble.
 
 %prep
-%setup -q
+%setup -q -n %{orgname}-%{version}
 
 %build
 install -d build
@@ -79,7 +81,7 @@
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name} --with-kde
+%find_lang %{orgname} --with-kde
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -87,7 +89,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files -f %{orgname}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/marble
 %attr(755,root,root) %{_bindir}/marble-touch
@@ -158,6 +160,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2012/01/21 20:36:44  arekm
+- now as kde4-marble
+
 Revision 1.16  2012/01/19 08:52:38  arekm
 - up to 4.8.0
 
================================================================

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