SPECS (DEVEL): kde4-kdepim.spec - subpackage names now show from which pack...

shadzik shadzik at pld-linux.org
Sat Oct 18 22:24:20 CEST 2008


Author: shadzik                      Date: Sat Oct 18 20:24:20 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- subpackage names now show from which package they come from

---- Files affected:
SPECS:
   kde4-kdepim.spec (1.71.2.15 -> 1.71.2.16) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdepim.spec
diff -u SPECS/kde4-kdepim.spec:1.71.2.15 SPECS/kde4-kdepim.spec:1.71.2.16
--- SPECS/kde4-kdepim.spec:1.71.2.15	Sat Oct 18 19:36:23 2008
+++ SPECS/kde4-kdepim.spec	Sat Oct 18 22:24:14 2008
@@ -74,15 +74,15 @@
 kdepim - це набір утиліт для керування персональною информацією для K
 Desktop Environment (KDE).
 
-%package -n kde4-kontact
+%package kontact
 Summary:	Kontact Personal Information Management
 Summary(pl.UTF-8):	Kontact Personal Information Management
 Group:		X11/Applications
 
-%description -n kde4-kontact
+%description kontact
 Kontact Personal Information Management.
 
-%description -n kde4-kontact -l pl.UTF-8
+%description kontact -l pl.UTF-8
 Kontact Personal Information Management.
 
 %package knode
@@ -122,17 +122,17 @@
 Leitor de notícias (news) do KDE.
 
 
-%package -n kde4-kontact-plugin-knode
+%package kontact-plugin-knode
 Summary:	Knode plugin for Kontact
 Summary(pl.UTF-8):	plugin Knode dla Kontact
 Group:		X11/Applications
 Requires:	%{name}-knode = %{version}-%{release}
-Requires:	kde4-kontact = %{version}-%{release}
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-knode
+%description kontact-plugin-knode
 Knode plugin for Kontact.
 
-%description -n kde4-kontact-plugin-knode -l pl.UTF-8
+%description kontact-plugin-knode -l pl.UTF-8
 Plugin Knode dla Kontact.
 
 %package ktimetracker
@@ -148,17 +148,17 @@
 KTimeTracker śledzi czas spędzony na różnych zajęciach. Jest przydatny
 przy obliczaniu godzin do wystawiania rachunków wielu klientom.
 
-%package -n kde4-kontact-plugin-ktimetracker
+%package kontact-plugin-ktimetracker
 Summary:	Ktimetracker plugin for Kontact
 Summary(pl.UTF-8):	plugin Ktimetracker dla Kontakt
 Group:		X11/Applications
 Requires:	%{name}-ktimetracker = %{version}-%{release}
-Requires:	kde4-kontact = %{version}-%{release}
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-ktimetracker
+%description kontact-plugin-ktimetracker
 Ktimetracker plugin for Kontact.
 
-%description -n kde4-kontact-plugin-ktimetracker -l pl.UTF-8
+%description kontact-plugin-ktimetracker -l pl.UTF-8
 plugin Ktimetracker dla Kontakt.
 
 %package kmail
@@ -208,17 +208,18 @@
 %description kmail -l pt_BR.UTF-8
 Poderoso cliente / leitor de e-mails para o KDE.
 
-%package -n kde4-kontact-plugin-kmail
+%package kontact-plugin-kmail
 Summary:	Kmail plugin for Kontact
 Summary(pl.UTF-8):	plugin Kmail dla Kontakt
 Group:		X11/Applications
+Obsoletes:	kde4-kontact-plugin-kmail
 Requires:	%{name}-kmail = %{version}-%{release}
-Requires:	kde4-kontact = %{version}-%{release}
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-kmail
+%description kontact-plugin-kmail
 Kmail plugin for Kontact.
 
-%description -n kde4-kontact-plugin-kmail -l pl.UTF-8
+%description kontact-plugin-kmail -l pl.UTF-8
 Plugin Kmail dla Kontakt.
 
 %package kaddressbook
@@ -234,29 +235,31 @@
 %description kaddressbook -l pl.UTF-8
 Książka adresowa dla KDE.
 
-%package -n kde4-kontact-plugin-kaddressbook
+%package kontact-plugin-kaddressbook
 Summary:	Kaddressbook plugin for Kontact
 Summary(pl.UTF-8):	plugin Kaddressbook dla Kontakt
 Group:		X11/Applications
+Obsoletes:	kde4-kontact-plugin-kaddressbook
 Requires:	%{name}-kaddressbook = %{version}-%{release}
-Requires:	kde4-kontact = %{version}-%{release}
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-kaddressbook
+%description kontact-plugin-kaddressbook
 Kaddressbook plugin for Kontact.
 
-%description -n kde4-kontact-plugin-kaddressbook -l pl.UTF-8
+%description kontact-plugin-kaddressbook -l pl.UTF-8
 Plugin Kaddressbook dla Kontakt.
 
-%package -n kde4-kontact-plugin-planner
+%package kontact-plugin-planner
 Summary:	Planner plugin for Kontact
 Summary(pl.UTF-8):	plugin Planner dla Kontakt
 Group:		X11/Applications
-Requires:	kde4-kontact = %{version}-%{release}
+Obsoletes:	kde4-kontact-plugin-planner
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-planner
+%description kontact-plugin-planner
 Planner plugin for Kontact.
 
-%description -n kde4-kontact-plugin-planner -l pl.UTF-8
+%description kontact-plugin-planner -l pl.UTF-8
 Plugin Planner dla Kontakt.
 
 %package korganizer
@@ -285,17 +288,18 @@
 %description korganizer -l pl.UTF-8
 Korganizer.
 
-%package -n kde4-kontact-plugin-korganizer
+%package kontact-plugin-korganizer
 Summary:	Korganizer plugin for Kontact
 Summary(pl.UTF-8):	plugin korganizer dla Kontakt
 Group:		X11/Applications
+Obsoletes:	kde4-kontact-plugin-korganizer
 Requires:	%{name}-korganizer = %{version}-%{release}
-Requires:	kde4-kontact = %{version}-%{release}
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-korganizer
+%description kontact-plugin-korganizer
 Korganizer plugin for Kontact.
 
-%description -n kde4-kontact-plugin-korganizer -l pl.UTF-8
+%description kontact-plugin-korganizer -l pl.UTF-8
 Plugin korganizer dla Kontakt.
 
 %package kmobiletools
@@ -309,53 +313,57 @@
 %description kmobiletools -l pl.UTF-8
 Narzędzie do komunikacji między telefonem komórkowym a PC.
 
-%package -n kde4-kontact-plugin-kmobiletools
+%package kontact-plugin-kmobiletools
 Summary:	Kmobiletools plugin for Kontact
 Summary(pl.UTF-8):	plugin kmobiletools dla Kontakt
 Group:		X11/Applications
+Obsoletes:	kde4-kontact-plugin-kmobiletools
 Requires:	%{name}-kmobiletools = %{version}-%{release}
-Requires:	kde4-kontact = %{version}-%{release}
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-kmobiletools
+%description kontact-plugin-kmobiletools
 Kmobiletools plugin for Kontact.
 
-%description -n kde4-kontact-plugin-kmobiletools -l pl.UTF-8
+%description kontact-plugin-kmobiletools -l pl.UTF-8
 Plugin kmobiletools dla Kontakt.
 
-%package -n kde4-kontact-plugin-summary
+%package kontact-plugin-summary
 Summary:	Summary plugin for Kontact
 Summary(pl.UTF-8):	plugin Summary dla Kontakt
 Group:		X11/Applications
-Requires:	kde4-kontact = %{version}-%{release}
+Obsoletes:	kde4-kontact-plugin-summary
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-summary
+%description kontact-plugin-summary
 Summary plugin for Kontact.
 
-%description -n kde4-kontact-plugin-summary -l pl.UTF-8
+%description kontact-plugin-summary -l pl.UTF-8
 Plugin Summary dla Kontakt.
 
-%package -n kde4-kontact-plugin-specialdates
+%package kontact-plugin-specialdates
 Summary:	Specialdates plugin for Kontact
 Summary(pl.UTF-8):	plugin Specialdates dla Kontakt.
 Group:		X11/Applications
-Requires:	kde4-kontact = %{version}-%{release}
+Obsoletes:	kde4-kontact-plugin-specialdates
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-specialdates
+%description kontact-plugin-specialdates
 Specialdates plugin for Kontact.
 
-%description -n kde4-kontact-plugin-specialdates -l pl.UTF-8
+%description kontact-plugin-specialdates -l pl.UTF-8
 Plugin Specialdates dla Kontakt.
 
-%package -n kde4-kontact-plugin-newsticker
+%package kontact-plugin-newsticker
 Summary:	Newsticker plugin for Kontact
 Summary(pl.UTF-8):	plugin Newsticker dla Kontakt
 Group:		X11/Applications
-Requires:	kde4-kontact = %{version}-%{release}
+Obsoletes:	kde4-kontact-plugin-newsticker
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-newsticker
+%description kontact-plugin-newsticker
 Newsticker plugin for Kontact.
 
-%description -n kde4-kontact-plugin-newsticker -l pl.UTF-8
+%description kontact-plugin-newsticker -l pl.UTF-8
 Plugin Newsticker dla Kontakt.
 
 %package akregator
@@ -376,29 +384,31 @@
 %description akregator -l pl.UTF-8
 Czytnik newsów dla KDE.
 
-%package -n kde4-kontact-plugin-akregator
+%package kontact-plugin-akregator
 Summary:	Akregator plugin for Kontact
 Summary(pl.UTF-8):	plugin Akregator dla Kontakt
 Group:		X11/Applications
+Obsoletes:	kde4-kontact-plugin-akregator
 Requires:	%{name}-akregator = %{version}-%{release}
-Requires:	kde4-kontact = %{version}-%{release}
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-akregator
+%description kontact-plugin-akregator
 Akregator plugin for Kontact.
 
-%description -n kde4-kontact-plugin-akregator -l pl.UTF-8
+%description kontact-plugin-akregator -l pl.UTF-8
 Plugin Akregator dla Kontakt.
 
-%package -n kde4-kontact-plugin-weather
+%package kontact-plugin-weather
 Summary:	Weather plugin for Kontact
 Summary(pl.UTF-8):	plugin Weather dla Kontakt
 Group:		X11/Applications
-Requires:	kde4-kontact = %{version}-%{release}
+Obsoletes:	kde4-kontact-plugin-weather
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-weather
+%description kontact-plugin-weather
 Weather plugin for Kontact.
 
-%description -n kde4-kontact-plugin-weather -l pl.UTF-8
+%description kontact-plugin-weather -l pl.UTF-8
 Plugin Weather dla Kontakt.
 
 %package knotes
@@ -418,17 +428,18 @@
 i drukować notatki, a także przyjmować przeciąganie nawet ze zdalnych
 komputerów.
 
-%package -n kde4-kontact-plugin-knotes
+%package kontact-plugin-knotes
 Summary:	Knotes plugin for Kontact
 Summary(pl.UTF-8):	plugin Knotes dla Kontakt
 Group:		X11/Applications
+Obsoletes:	kde4-kontact-plugin-knotes
 Requires:	%{name}-knotes = %{version}-%{release}
-Requires:	kde4-kontact = %{version}-%{release}
+Requires:	%{name}-kontact = %{version}-%{release}
 
-%description -n kde4-kontact-plugin-knotes
+%description kontact-plugin-knotes
 Knotes plugin for Kontact.
 
-%description -n kde4-kontact-plugin-knotes -l pl.UTF-8
+%description kontact-plugin-knotes -l pl.UTF-8
 Plugin Knotes dla Kontakt.
 
 %package devel
@@ -476,26 +487,28 @@
 - listy klas i ich składników
 - listę przestrzeni nazw (namespace)
 
-%package -n kde4-kio-groupwise
+%package kio-groupwise
 Summary:	Groupwise protocol service
 Summary(pl.UTF-8):	Obsługa protokołu Groupwise
 Group:		X11/Libraries
+Obsoletes:	kde4-kio-groupwise
 
-%description -n kde4-kio-groupwise
+%description kio-groupwise
 Groupwise protocol service.
 
-%description -n kde4-kio-groupwise -l pl.UTF-8
+%description kio-groupwise -l pl.UTF-8
 Obsługa protokołu Groupwise.
 
-%package -n kde4-kio-imap4
+%package kio-imap4
 Summary:	IMAP4 protocol service
 Summary(pl.UTF-8):	Obsługa protokołu IMAP4
 Group:		X11/Libraries
+Obsoletes:	kde4-kio-imap4
 
-%description -n kde4-kio-imap4
+%description kio-imap4
 IMAP4 protocol service.
 
-%description -n kde4-kio-imap4 -l pl.UTF-8
+%description kio-imap4 -l pl.UTF-8
 Obsługa protokołu IMAP4.
 
 %package kalarm
@@ -881,7 +894,7 @@
 %attr(755,root,root) %{_libdir}/kde4/kcal_blog.so
 %{_datadir}/kde4/services/kresources/kcal/blog.desktop
 
-%files -n kde4-kontact -f kontact.lang
+%files kontact -f kontact.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kontact
 %attr(755,root,root) %{_libdir}/kde4/kcm_kontact.so
@@ -908,7 +921,7 @@
 %{_iconsdir}/*/*/apps/knode.png
 %{_iconsdir}/*/*/apps/knode2.png
 
-%files -n kde4-kontact-plugin-knode
+%files kontact-plugin-knode
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kontact_knodeplugin.so
 %dir %{_datadir}/kde4/services/kontact
@@ -928,7 +941,7 @@
 %{_datadir}/kde4/services/ktimetrackerpart.desktop
 %{_iconsdir}/*/*/apps/ktimetracker.png
 
-%files -n kde4-kontact-plugin-ktimetracker
+%files kontact-plugin-ktimetracker
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kontact_ktimetrackerplugin.so
 %{_datadir}/kde4/services/kontact/ktimetracker_plugin.desktop
@@ -994,7 +1007,7 @@
 ### libkleo
 %attr(755,root,root) %{_libdir}/libkleo.so
 
-%files -n kde4-kontact-plugin-kmail
+%files kontact-plugin-kmail
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kontact_kmailplugin.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_kmailsummary.so
@@ -1029,12 +1042,12 @@
 %{_datadir}/kde4/servicetypes/kaddressbookimprotocol.desktop
 %{_iconsdir}/*/*/apps/kaddressbook.*
 
-%files -n kde4-kontact-plugin-kaddressbook
+%files kontact-plugin-kaddressbook
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kontact_kaddressbookplugin.so
 %{_datadir}/kde4/services/kontact/kaddressbookplugin.desktop
 
-%files -n kde4-kontact-plugin-planner
+%files kontact-plugin-planner
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kontact_plannerplugin.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_planner.so
@@ -1080,7 +1093,7 @@
 %attr(755,root,root) %{_libdir}/libkholidays.so
 %{_datadir}/apps/libkholidays
 
-%files -n kde4-kontact-plugin-korganizer
+%files kontact-plugin-korganizer
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kontact_korganizerplugin.so
 %attr(755,root,root) %{_libdir}/kde4/kontact_todoplugin.so
@@ -1123,12 +1136,12 @@
 #%{_iconsdir}/*/*/actions/overlaydisc.png
 #%{_iconsdir}/*/*/actions/smslist.png
 
-#%files -n kde4-kontact-plugin-kmobiletools
+#%files kontact-plugin-kmobiletools
 #%defattr(644,root,root,755)
 #%attr(755,root,root) %{_libdir}/kde4/kontact_kmobiletoolsplugin.so
 #%{_datadir}/kde4/services/kontact/kmobiletools.desktop
 
-%files -n kde4-kontact-plugin-summary
+%files kontact-plugin-summary
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kontact_summaryplugin.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_kontactsummary.so
@@ -1137,14 +1150,14 @@
 %dir %{_datadir}/apps/kontactsummary
 %{_datadir}/apps/kontactsummary/kontactsummary_part.rc
 
-%files -n kde4-kontact-plugin-specialdates
+%files kontact-plugin-specialdates
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kontact_specialdatesplugin.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_sdsummary.so
 %{_datadir}/kde4/services/kontact/specialdatesplugin.desktop
 %{_datadir}/kde4/services/kcmsdsummary.desktop
 
-#%files -n kde4-kontact-plugin-newsticker
+#%files kontact-plugin-newsticker
 #%defattr(644,root,root,755)
 #%attr(755,root,root) %{_libdir}/kde4/kontact_newstickerplugin.so
 #%attr(755,root,root) %{_libdir}/kde4/kcm_kontactknt.so
@@ -1177,13 +1190,13 @@
 %dir %{_datadir}/apps/akregator_onlinesync_plugin
 %{_datadir}/apps/akregator_onlinesync_plugin/akregator_onlinesync_plugin.rc
 
-%files -n kde4-kontact-plugin-akregator
+%files kontact-plugin-akregator
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kontact_akregatorplugin.so
 %{_datadir}/kde4/services/kontact/akregatorplugin.desktop
 #%{_datadir}/kde4/services/kontact/akregatorplugin3.2.desktop
 
-#%files -n kde4-kontact-plugin-weather
+#%files kontact-plugin-weather
 #%defattr(644,root,root,755)
 #%attr(755,root,root) %{_libdir}/kde4/kontact_weatherplugin.so
 #%{_datadir}/kde4/services/kontact/weatherplugin.desktop
@@ -1201,7 +1214,7 @@
 %{_datadir}/kde4/services/kresources/knotes/local.desktop
 %{_iconsdir}/*/*/apps/knotes.png
 
-%files -n kde4-kontact-plugin-knotes
+%files kontact-plugin-knotes
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kontact_knotesplugin.so
 %{_datadir}/apps/knotes/knotes_part.rc
@@ -1281,7 +1294,7 @@
 
 %{_datadir}/apps/cmake/modules/*.cmake
 
-%files -n kde4-kio-groupwise
+%files kio-groupwise
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kio_groupwise.so
 %attr(755,root,root) %{_libdir}/kde4/kabc_groupwise.so
@@ -1639,6 +1652,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71.2.16  2008/10/18 20:24:14  shadzik
+- subpackage names now show from which package they come from
+
 Revision 1.71.2.15  2008/10/18 17:36:23  rotom
 - up to 4.1.70
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdepim.spec?r1=1.71.2.15&r2=1.71.2.16&f=u



More information about the pld-cvs-commit mailing list