packages: kde4-calligra-l10n/kde4-calligra-l10n.spec - rel 1 - added obsole...

baggins baggins at pld-linux.org
Fri Jun 29 11:10:37 CEST 2012


Author: baggins                      Date: Fri Jun 29 09:10:37 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1
- added obsoletes for koffice packages
- require same calligra version as l10n

---- Files affected:
packages/kde4-calligra-l10n:
   kde4-calligra-l10n.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/kde4-calligra-l10n/kde4-calligra-l10n.spec
diff -u packages/kde4-calligra-l10n/kde4-calligra-l10n.spec:1.1 packages/kde4-calligra-l10n/kde4-calligra-l10n.spec:1.2
--- packages/kde4-calligra-l10n/kde4-calligra-l10n.spec:1.1	Tue Jun 26 14:56:07 2012
+++ packages/kde4-calligra-l10n/kde4-calligra-l10n.spec	Fri Jun 29 11:10:32 2012
@@ -14,7 +14,7 @@
 Summary(pl.UTF-8):	Calligra - wsparcie dla wielu języków
 Name:		kde4-calligra-l10n
 Version:	2.4.2
-Release:	0.1
+Release:	1
 License:	GPL
 Group:		I18n
 Source0:	ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{orgname}-ca-%{version}.tar.bz2
@@ -76,6 +76,11 @@
 BuildRequires:	qt4-build
 BuildRequires:	qt4-qmake
 BuildRequires:	rpmbuild(macros) >= 1.600
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n
+Obsoletes:	kde4-koffice-l10n-Frisian
+Obsoletes:	kde4-koffice-l10n-Galician
+Obsoletes:	kde4-koffice-l10n-Japanese
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -89,6 +94,8 @@
 Summary:	Calligra suite - Catalan language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka katalońskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Catalan
 
 %description Catalan
 Calligra suite - Catalan language support.
@@ -100,6 +107,7 @@
 Summary:	Calligra suite - Catalan Valencian language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka walenckiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
 
 %description Catalan_Valencian
 Calligra suite - Catalan Valencian language support.
@@ -111,6 +119,7 @@
 Summary:	Calligra suite - Czech language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka czeskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
 
 %description Czech
 Calligra suite - Czech language support.
@@ -122,6 +131,8 @@
 Summary:	Calligra suite - Danish language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka duńskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Danish
 
 %description Danish
 Calligra suite - Danish language support.
@@ -133,6 +144,8 @@
 Summary:	Calligra suite - German language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka niemieckiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-German
 
 %description German
 Calligra suite - German language support.
@@ -144,6 +157,8 @@
 Summary:	Calligra suite - Greek language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka greckiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Greek
 
 %description Greek
 Calligra suite - Greek language support.
@@ -155,6 +170,8 @@
 Summary:	Calligra suite - Kazakh language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka kazachskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Kazakh
 
 %description Kazakh
 Calligra suite - Kazakh language support.
@@ -166,6 +183,8 @@
 Summary:	Calligra suite - Calligra suite - English (UK) language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka angielskiego (odmiany brytyjskiej)
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-English_UK
 
 %description English_UK
 Calligra suite - English (UK) language support.
@@ -177,6 +196,8 @@
 Summary:	Calligra suite - Spanish language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka hiszpańskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Spanish
 
 %description Spanish
 Calligra suite - Spanish language support.
@@ -188,6 +209,8 @@
 Summary:	Calligra suite - Estonian language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka estońskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Estonian
 
 %description Estonian
 Calligra suite - Estonian language support.
@@ -199,6 +222,8 @@
 Summary:	Calligra suite - French language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka francuskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-French
 
 %description French
 Calligra suite - French language support.
@@ -210,6 +235,7 @@
 Summary:	Calligra suite - Finnish language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka fińskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
 
 %description Finnish
 Calligra suite - Finnish language support.
@@ -221,6 +247,8 @@
 Summary:	Calligra suite - Italian language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka włoskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Italian
 
 %description Italian
 Calligra suite - Italian language support.
@@ -232,6 +260,7 @@
 Summary:	Calligra suite - Hungarian language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka węgierskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
 
 %description Hungarian
 Calligra suite - Hungarian language support.
@@ -243,6 +272,8 @@
 Summary:	Calligra suite - Low Saxon language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka dolnosaksońskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Low_Saxon
 
 %description Low_Saxon
 Calligra suite - Low Saxon language support.
@@ -254,6 +285,8 @@
 Summary:	Calligra suite - Norwegian (Bokmaal) language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka norweskiego (odmiany bokmaal)
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Norwegian_Bokmaal
 
 %description Norwegian_Bokmaal
 Calligra suite - Norwegian (Bokmaal) language support.
@@ -265,6 +298,8 @@
 Summary:	Calligra suite - Dutch language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka holenderskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Dutch
 
 %description Dutch
 Calligra suite - Dutch language support.
@@ -276,6 +311,8 @@
 Summary:	Calligra suite - Polish language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka polskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Polish
 
 %description Polish
 Calligra suite - Polish language support.
@@ -287,6 +324,8 @@
 Summary:	Calligra suite - Portuguese language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka portugalskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Portuguese
 
 %description Portuguese
 Calligra suite - Portuguese language support.
@@ -298,6 +337,8 @@
 Summary:	Calligra suite - Portuguese (Brazil) language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka portugalskiego (odmiany brazylijskiej)
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Brazil_Portuguese
 
 %description Brazil_Portuguese
 Calligra suite - Portuguese (Brazil) language support.
@@ -309,6 +350,7 @@
 Summary:	Calligra suite - Slovak language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka słowackiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
 
 %description Slovak
 Calligra suite - Slovak language support.
@@ -320,6 +362,8 @@
 Summary:	Calligra suite - Swedish language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka szwedzkiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Swedish
 
 %description Swedish
 Calligra suite - Swedish language support.
@@ -331,6 +375,7 @@
 Summary:	Calligra suite - Russian language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka rosyjskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
 
 %description Russian
 Calligra suite - Russian language support.
@@ -342,6 +387,8 @@
 Summary:	Calligra suite - Turkish language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka tureckiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Turkish
 
 %description Turkish
 Calligra suite - Turkish language support.
@@ -353,6 +400,8 @@
 Summary:	Calligra suite - Ukrainian language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka ukraińskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Ukrainian
 
 %description Ukrainian
 Calligra suite - Ukrainian language support.
@@ -364,6 +413,8 @@
 Summary:	Calligra suite - Walloon language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka walońskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Walloon
 
 %description Walloon
 Calligra suite - Walloon language support.
@@ -375,6 +426,8 @@
 Summary:	Calligra suite - simplified Chinese language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla uproszczonego języka chińskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Simplified_Chinese
 
 %description Simplified_Chinese
 Calligra suite - simplified Chinese language support.
@@ -386,6 +439,8 @@
 Summary:	Calligra suite - Chinese language support
 Summary(pl.UTF-8):	Calligra - wsparcie dla języka chińskiego
 Group:		I18n
+Requires:	kde4-calligra-common = %{version}
+Obsoletes:	kde4-koffice-l10n-Chinese
 
 %description Chinese
 Calligra suite - Chinese language support.
@@ -590,6 +645,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/06/29 09:10:32  baggins
+- rel 1
+- added obsoletes for koffice packages
+- require same calligra version as l10n
+
 Revision 1.1  2012/06/26 12:56:07  baggins
 - initial, based on koffice
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/kde4-calligra-l10n/kde4-calligra-l10n.spec?r1=1.1&r2=1.2



More information about the pld-cvs-commit mailing list