SPECS: metapackage-kde.spec - cleanups

[glen]

Author: glen                         Date: Thu Mar 15 14:54:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups

---- Files affected:
SPECS:
   metapackage-kde.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/metapackage-kde.spec
diff -u SPECS/metapackage-kde.spec:1.1 SPECS/metapackage-kde.spec:1.2
--- SPECS/metapackage-kde.spec:1.1	Thu Mar 15 15:51:48 2007
+++ SPECS/metapackage-kde.spec	Thu Mar 15 15:54:31 2007
@@ -5,7 +5,6 @@
 Release:	0.1
 License:	Freeware
 Group:		Applications/System
-Obsoletes:	role-kde
 Requires:	X11-OpenGL-libGL
 Requires:	giflib
 Requires:	hicolor-icon-theme
@@ -50,9 +49,8 @@
 Requires:	kdeutils-kgpg
 Requires:	kdeutils-kwalletmanager
 Requires:	konqueror
-Requires:	role-X11-fonts
-%ifnarch %{x8664}
-Requires:	macromedia-flash
+%ifarch %{ix86}
+Requires:	adobe-flash
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -61,7 +59,7 @@
 %description
 Package to build up KDE desktop environment.
 
-%package -n role-kmail
+%package kmail
 Summary:	kmail
 Group:		Applications/Mail
 Requires:	cyrus-sasl
@@ -78,45 +76,8 @@
 Requires:	kdepim-kmail
 Requires:	keychain >= 2.5.0
 Requires:	pinentry-qt
-Obsoletes:	role-kde-kmail
 
-%description -n role-kmail
-
-%package -n role-X11
-Summary:	X11
-Group:		Applications/Mail
-Requires:	X11-Xserver
-Obsoletes:	role-kde-X11
-
-%description -n role-X11
-
-%package -n role-X11-fonts
-Summary:	fonts
-Group:		Applications/Mail
-Requires:	fonts-TTF-bitstream-vera
-Requires:	fonts-TTF-microsoft
-Requires:	fonts-TTF-microsoft-tahoma
-Requires:	role-X11
-Obsoletes:	role-fonts
-Obsoletes:	role-kde-fonts
-
-#X11-fonts
-#X11-fonts-75dpi
-#X11-fonts-75dpi-ISO8859-1
-#X11-fonts-75dpi-ISO8859-10
-#X11-fonts-75dpi-ISO8859-13
-#X11-fonts-75dpi-ISO8859-14
-#X11-fonts-75dpi-ISO8859-15
-#X11-fonts-75dpi-ISO8859-2
-#X11-fonts-75dpi-ISO8859-3
-#X11-fonts-75dpi-ISO8859-4
-#X11-fonts-75dpi-ISO8859-9
-#X11-fonts-ISO8859-1
-#X11-fonts-ISO8859-2
-#X11-fonts-ISO8859-3
-#X11-fonts-KOI8-R
-
-%description -n role-X11-fonts
+%description kmail
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -127,76 +88,17 @@
 %files
 %defattr(644,root,root,755)
 
-%files -n role-kmail
-%defattr(644,root,root,755)
-
-%files -n role-X11
-%defattr(644,root,root,755)
-
-%files -n role-X11-fonts
+%files kmail
 %defattr(644,root,root,755)
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
-* %{date} RPM Team <rpm at cvs.delfi.ee>
-All persons listed below can be reached at <cvs_login>@cvs.delfi.ee
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2007/03/15 14:54:31  glen
+- cleanups
+
 Revision 1.1  2007/03/15 14:51:48  glen
 - new, my previous work
-
-Revision 1.18  2007/03/15 14:48:23  glen
-- no redmond, rel 3
-
-Revision 1.17  2006/08/31 20:38:59  glen
-- add kview
-
-Revision 1.16  2006/08/31 19:39:15  glen
-- add kio_ldap to kmail
-
-Revision 1.15  2006/08/31 14:25:21  glen
-- adapterized
-
-Revision 1.14  2005/09/18 21:54:07  glen
-- don't enforce kside style
-
-Revision 1.13  2005/09/04 20:47:48  glen
-- new name for macromedia flash plugin
-
-Revision 1.12  2005/07/29 10:19:56  glen
-- fonts-TTF-bitstream-vera to fonts
-
-Revision 1.11  2005/06/12 17:45:27  glen
-- add kdepim and kdepim-kaddressbook for kmail
-
-Revision 1.10  2005/06/08 19:06:50  glen
-- add gnupg2 to kmail
-
-Revision 1.9  2005/06/08 16:51:26  glen
-- pinentry for kmail
-
-Revision 1.8  2005/06/08 16:46:34  glen
-- renamed non-kde packages
-- updated kmail package deps with gnupg-smime
-
-Revision 1.7  2005/06/08 16:22:43  glen
-- X11 and fonts subpackages
-
-Revision 1.6  2005/06/06 21:42:46  glen
-- no flash plugin on amd64, back to arch
-
-Revision 1.5  2005/06/06 21:34:39  glen
-- noarch
-
-Revision 1.4  2005/06/06 20:39:30  glen
-- kmail subpackage
-
-Revision 1.3  2005/05/11 07:59:26  glen
-- add flash dep
-- add hicolor icons
-
-Revision 1.2  2005/05/03 19:50:47  glen
-- base kde packages added
-
-Revision 1.1  2005/05/03 18:48:03  glen
-- new ;)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/metapackage-kde.spec?r1=1.1&r2=1.2&f=u