SPECS (AC-branch): metapackage-gnome.spec - no amrnb - use existin...

[glen]

Author: glen                         Date: Mon Mar 12 07:55:38 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- no amrnb
- use existing Group
- adapterized

---- Files affected:
SPECS:
   metapackage-gnome.spec (1.14.2.3 -> 1.14.2.4) 

---- Diffs:

================================================================
Index: SPECS/metapackage-gnome.spec
diff -u SPECS/metapackage-gnome.spec:1.14.2.3 SPECS/metapackage-gnome.spec:1.14.2.4
--- SPECS/metapackage-gnome.spec:1.14.2.3	Fri May 19 01:23:13 2006
+++ SPECS/metapackage-gnome.spec	Mon Mar 12 08:55:33 2007
@@ -3,9 +3,9 @@
 Summary(pl):	Środowisko graficzne GNOME
 Name:		metapackage-gnome
 Version:	2.14
-Release:	3
+Release:	4
 License:	GPL/LGPL
-Group:		X11/Applications/Desktop
+Group:		X11/Applications
 Requires:	bug-buddy >= 2.14.0
 Requires:	cdrtools
 Requires:	cdrtools-mkisofs
@@ -13,8 +13,8 @@
 Requires:	control-center >= 2.14.1
 Requires:	eog >= 2.14.1
 Requires:	epiphany >= 2.14.1
-Requires:	epiphany-extensions >= 2.14.1
 Requires:	epiphany-extension-gwget >= 0.98
+Requires:	epiphany-extensions >= 2.14.1
 Requires:	evince >= 0.5.2
 Requires:	evolution >= 2.6.1
 Requires:	evolution-addressbook >= 2.6.1
@@ -98,6 +98,8 @@
 Requires:	zenity >= 2.14.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%prep
+
 %description
 GNOME Desktop suite metapackage.
 
@@ -107,7 +109,7 @@
 %package extras
 Summary:	Metapackage to install additional packages for GNOME Desktop
 Summary(pl):	Metapakiet instalujący dodatkowe pakiety dla środowiska graficznego GNOME
-Group:		X11/Applications/Desktop
+Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
 Requires:	dasher >= 4.0.2
 Requires:	evolution-calendar >= 2.6.1
@@ -139,11 +141,6 @@
 Requires:	gnome-games-same-gnome >= 1:2.14.1
 Requires:	gnome-games-sol >= 1:2.14.1
 Requires:	gnome-themes-Crux >= 2.14.0
-Requires:	gnome-themes-extras-Amaranth >= 0.9.0-2
-Requires:	gnome-themes-extras-Gorilla >= 0.9.0-2
-Requires:	gnome-themes-extras-Lush >= 0.9.0-2
-Requires:	gnome-themes-extras-Nuvola >= 0.9.0-2
-Requires:	gnome-themes-extras-Wasp >= 0.9.0-2
 Requires:	gnome-themes-Flat-Blue >= 2.14.0
 Requires:	gnome-themes-Glider >= 2.14.0
 Requires:	gnome-themes-Grand-Canyon >= 2.14.0
@@ -156,8 +153,12 @@
 Requires:	gnome-themes-Smokey-Blue >= 2.14.0
 Requires:	gnome-themes-Smokey-Red >= 2.14.0
 Requires:	gnome-themes-Traditional >= 2.14.0
+Requires:	gnome-themes-extras-Amaranth >= 0.9.0-2
+Requires:	gnome-themes-extras-Gorilla >= 0.9.0-2
+Requires:	gnome-themes-extras-Lush >= 0.9.0-2
+Requires:	gnome-themes-extras-Nuvola >= 0.9.0-2
+Requires:	gnome-themes-extras-Wasp >= 0.9.0-2
 Requires:	gstreamer-aac >= 0.10.1
-Requires:	gstreamer-amrnb >= 0.10.3
 Requires:	gstreamer-audio-effects-bad >= 0.10.1
 Requires:	gstreamer-dts >= 0.10.1
 Requires:	gstreamer-dv >= 0.10.2
@@ -206,7 +207,7 @@
 %package extras-accessibility
 Summary:	Accessibility packages for GNOME Desktop
 Summary(pl):	Pakiety ułatwień dostępu dla środowiska graficznego GNOME
-Group:		X11/Applications/Desktop
+Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
 Requires:	gnome-mag >= 0.12.4
 Requires:	gnome-speech >= 0.3.10
@@ -229,7 +230,7 @@
 %package office
 Summary:	Office suite for GNOME Desktop
 Summary(pl):	Pakiety biurowe dla środowiska graficznego GNOME
-Group:		X11/Applications/Desktop
+Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
 Requires:	abiword >= 1:2.2.9
 Requires:	dia >= 1:0.94-8
@@ -242,10 +243,17 @@
 %description office -l pl
 Pakiety biurowe dla środowiska graficznego GNOME.
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files
+%defattr(644,root,root,755)
 %files extras
+%defattr(644,root,root,755)
 %files extras-accessibility
+%defattr(644,root,root,755)
 %files office
+%defattr(644,root,root,755)
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -253,6 +261,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14.2.4  2007/03/12 07:55:33  glen
+- no amrnb
+- use existing Group
+- adapterized
+
 Revision 1.14.2.3  2006/05/18 23:23:13  baggins
 - release 3
 - final update and cleanup
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/metapackage-gnome.spec?r1=1.14.2.3&r2=1.14.2.4&f=u