Proszę o nałożenie diffa
1. Wydzieliłem subpakiet apps dla programów, których nie każdy używa
2. Zmiana kolejność w zależnościach tak, by poldek zadawał mniej pytań
użytkownikowi
3. Dodałem parę rzeczy od siebie
--
Paweł Kwiatkowskowski
email/jid: qwiat (at) pld-linux (dot) org
--- metapackage-gnome.spec 2008-01-13 03:22:11.014740719 +0100
+++ metapackage-gnome_new.spec 2008-01-13 03:21:16.018520519 +0100
@@ -1,4 +1,4 @@
-# $Revision: 1.26 $, $Date: 2007-10-13 23:20:04 $
+# $Revision: 1.26 $, $Date: 2007/10/13 23:20:04 $
#
# TODO:
# - metapackage with development tools (glade, bluefish, anjuta, etc.)
@@ -9,77 +9,38 @@
Summary(pl.UTF-8): Årodowisko graficzne GNOME
Name: metapackage-gnome
Version: 2.20.0
-Release: 2
+Release: 3
License: GPL/LGPL
Group: X11/Applications
-Requires: alacarte >= 0.11.3
-Requires: bug-buddy >= 2.20.0
-Requires: cdrtools
-Requires: cdrtools-mkisofs
-Requires: cdrtools-readcd
-Requires: eog >= 2.20.0
-Requires: epiphany >= 2.20.0
-Requires: epiphany-extension-gwget >= 0.99
-Requires: epiphany-extensions >= 2.20.0
-Requires: evince >= 2.20.0
-Requires: eel >= 2.20.0
-Requires: evolution >= 2.12.0
-Requires: evolution-addressbook >= 2.12.0
-Requires: evolution-mail >= 2.12.0
-Requires: file-roller >= 2.20.0
-Requires: gcalctool >= 5.20.1
-Requires: gconf-editor >= 2.20.0
-Requires: gedit2 >= 2.20.0
-Requires: gnome-applet-deskbar >= 2.20.0
-Requires: gnome-applets-accessx-status >= 1:2.20.0
-Requires: gnome-applets-battstat >= 1:2.20.0
-Requires: gnome-applets-charpicker >= 1:2.20.0
-Requires: gnome-applets-cpufreq >= 1:2.20.0
-Requires: gnome-applets-drivemount >= 1:2.20.0
-Requires: gnome-applets-geyes >= 1:2.20.0
-Requires: gnome-applets-gweather >= 1:2.20.0
-Requires: gnome-applets-invest >= 1:2.20.0
-Requires: gnome-applets-keyboard >= 1:2.20.0
-Requires: gnome-applets-minicommander >= 1:2.20.0
-Requires: gnome-applets-mixer >= 1:2.20.0
-Requires: gnome-applets-modemlights >= 1:2.20.0
-Requires: gnome-applets-multiload >= 1:2.20.0
-Requires: gnome-applets-stickynotes >= 1:2.20.0
-Requires: gnome-applets-trash >= 1:2.20.0
-Requires: gnome-backgrounds >= 2.20.0
Requires: gnome-common >= 2.20.0
-Requires: gnome-commander >= 1.2.4
+Requires: GConf2 >= 2.20.0
+Requires: fam-libs >= 2.7.0
+Requires: gnome-menus-filter-default >= 2.20.0
+Requires: gnome-menus >= 2.20.0
+Requires: gnome-vfs2 >= 2.20.0
+Requires: rarian-compat >= 0.7.0
+Requires: gnome-utils >= 1:2.20.0
+Requires: gnome-utils-screenshot >= 1:2.20.0
+Requires: gnome-utils-search-tool >= 1:2.20.0
+Requires: metacity-themes-AgingGorilla >= 2:2.20.0
+Requires: nautilus >= 2.20.0
Requires: gnome-control-center >= 2.20.0
+Requires: metacity >= 2.20.0
+Requires: gnome-session >= 2.20.0
Requires: gnome-desktop >= 2.20.0
+Requires: gnome-panel >= 2.20.0.1
+Requires: gnome-volume-manager >= 2.17.0
Requires: gnome-icon-theme >= 2.20.0
Requires: gnome-keyring >= 2.20.0
Requires: gnome-keyring-manager >= 2.20.0
-#Requires: gnome-mail-notification >= 4.1
-Requires: gnome-media-cd >= 2.20.1
-Requires: gnome-media-cddb >= 2.20.1
-Requires: gnome-media-sound-recorder >= 2.20.1
-Requires: gnome-media-volume-control >= 2.20.1
-Requires: gnome-media-vumeter >= 2.20.1
-Requires: gnome-menus >= 2.20.0
Requires: gnome-netstatus >= 2.12.1
-Requires: gnome-nettool >= 2.20.0
-Requires: gnome-panel >= 2.20.0.1
-Requires: gnome-power-manager >= 2.20.0
Requires: gnome-screensaver >= 2.20.0
-Requires: gnome-session >= 2.20.0
Requires: gnome-system-monitor >= 2.20.0
-Requires: gnome-system-tools >= 2.20.0
-Requires: gnome-terminal >= 2.18.0
Requires: gnome-themes-Clearlooks >= 2.20.0
Requires: gnome-themes-ClearlooksClassic >= 2.20.0
-Requires: gnome-utils >= 1:2.20.0
-Requires: gnome-utils-baobab >= 1:2.20.0
-Requires: gnome-utils-dictionary >= 1:2.20.0
-Requires: gnome-utils-floppy >= 1:2.20.0
-Requires: gnome-utils-logview >= 1:2.20.0
-Requires: gnome-utils-screenshot >= 1:2.20.0
-Requires: gnome-utils-search-tool >= 1:2.20.0
-Requires: gnome-volume-manager >= 2.17.0
+Requires: gnome-backgrounds >= 2.20.0
+Requires: gnome-terminal >= 2.18.0
+Requires: esound
Requires: gstreamer >= 0.10.14
Requires: gstreamer-GConf >= 0.10.6
Requires: gstreamer-audio-effects-base >= 0.10.14
@@ -105,48 +66,106 @@
Requires: gstreamer-vorbis >= 0.10.14
Requires: gstreamer-x264 >= 0.10.5
Requires: gstreamer-xvid >= 0.10.5
-Requires: gucharmap >= 1.10.0
-Requires: gwget >= 0.99
+Requires: gnome-media >= 2.20.0
+Requires: gnome-media-cd >= 2.20.1
+Requires: gnome-media-volume-control >= 2.20.1
+Requires: cdrtools
+Requires: cdrtools-mkisofs
+Requires: cdrtools-readcd
+Requires: gnome-applets-drivemount >= 1:2.20.0
+Requires: gnome-applets-geyes >= 1:2.20.0
+Requires: gnome-applets-gweather >= 1:2.20.0
+Requires: gnome-applets-keyboard >= 1:2.20.0
+Requires: gnome-applets-minicommander >= 1:2.20.0
+Requires: gnome-applets-mixer >= 1:2.20.0
+Requires: gnome-applets-stickynotes >= 1:2.20.0
+Requires: gnome-applets-trash >= 1:2.20.0
Requires: icon-naming-utils >= 0.8.6
-Requires: metacity >= 2.20.0
-Requires: nautilus >= 2.20.0
+Requires: evolution-addressbook >= 2.12.0
+Requires: evolution-mail >= 2.12.0
+Requires: evolution >= 2.12.0
Requires: nautilus-cd-burner >= 2.20.0
Requires: nautilus-extension-evince
Requires: nautilus-sendto >= 0.10
Requires: nautilus-sendto-evolution
-Requires: rarian >= 0.6.0
-Requires: seahorse >= 2.20
-Requires: sound-juicer >= 2.20.0
-Requires: system-tools-backends >= 2.4.0
-Requires: startup-notification >= 0.9
-Requires: tomboy >= 0.8.0
Requires: totem >= 2.20.0
-Requires: vino >= 2.20.0
-Requires: yelp >= 2.20.0
-Requires: zenity >= 2.20.0
+Requires: epiphany >= 2.20.0
+Requires: eog >= 2.20.0
+Requires: evince >= 2.20.0
+Requires: eel >= 2.20.0
+Requires: file-roller >= 2.20.0
+Requires: gcalctool >= 5.20.1
+Requires: gedit2 >= 2.20.0
+Suggests: gdm >= 1:2.20.0
+Suggests: gdm-init >= 1:2.20.0
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-GNOME Desktop suite metapackage.
+Basic GNOME Desktop suite metapackage.
%description -l pl.UTF-8
-Metapakiet Årodowiska graficznego GNOME.
+Podstawowy metapakiet Årodowiska graficznego GNOME.
-%package extras
-Summary: Metapackage to install additional packages for GNOME Desktop
-Summary(pl.UTF-8): Metapakiet instalujÄ
cy dodatkowe pakiety dla Årodowiska graficznego GNOME
+%package apps
+Summary: Metapackage to install packages with usable applications for GNOME Desktop
+Summary(pl.UTF-8): Metapakiet instalujÄ
cy użyteczne aplikacje dla Årodowiska graficznego GNOME
Group: X11/Applications
-Requires: %{name} = %{version}-%{release}
-Requires: dasher >= 4.6.0
+Requires: alacarte >= 0.11.3
+Requires: gwget >= 0.99
+Requires: tomboy >= 0.8.0
+Requires: vino >= 2.20.0
+Requires: yelp >= 2.20.0
+Requires: rarian >= 0.6.0
+Requires: seahorse >= 2.20
+Requires: gucharmap >= 1.10.0
+Requires: sound-juicer >= 2.20.0
+Requires: epiphany-extension-gwget >= 0.99
+Requires: epiphany-extensions >= 2.20.0
+Requires: gnome-system-tools >= 2.20.0
+Requires: system-tools-backends >= 2.4.0
+Requires: gnome-nettool >= 2.20.0
+Requires: gnome-commander >= 1.2.4
+Requires: gnome-utils-baobab >= 1:2.20.0
+Requires: gnome-utils-dictionary >= 1:2.20.0
+Requires: gnome-utils-floppy >= 1:2.20.0
+Requires: gnome-utils-logview >= 1:2.20.0
+Requires: gnome-media-cddb >= 2.20.1
+Requires: gnome-media-sound-recorder >= 2.20.1
+Requires: gnome-applets-modemlights >= 1:2.20.0
+Requires: gnome-applets-invest >= 1:2.20.0
+Requires: gnome-applets-battstat >= 1:2.20.0
+Requires: gnome-applets-charpicker >= 1:2.20.0
+Requires: gnome-applets-cpufreq >= 1:2.20.0
+Requires: gnome-applet-deskbar >= 2.20.0
+Requires: gnome-power-manager >= 2.20.0
+Requires: gconf-editor >= 2.20.0
Requires: ekiga >= 2.0.11
Requires: evolution-calendar >= 2.12.0
Requires: evolution-exchange >= 2.12.0
Requires: evolution-pilot >= 2.12.0
Requires: evolution-rss >= 0.0.4
Requires: evolution-webcal >= 2.10.0
-Requires: gdm >= 1:2.20.0
+Requires: brasero >= 0.6
+Requires: gajim >= 0.11
+Requires: zenity >= 2.20.0
+Requires: gnome-device-manager >= 0.2
+#Requires: gnome-mail-notification >= 4.1
+
+%description apps
+Metapackage with usefull applications for GNOME Desktop.
+
+%description apps -l pl.UTF-8
+Metapakiet z użytecznymi aplikacjami dla Årodowiska GNOME.
+
+%package extras
+Summary: Metapackage to install additional packages for GNOME Desktop
+Summary(pl.UTF-8): Metapakiet instalujÄ
cy dodatkowe pakiety dla Årodowiska graficznego GNOME
+Group: X11/Applications
+Requires: %{name} = %{version}-%{release}
+Requires: dasher >= 4.6.0
Requires: gnome-applet-fast-user-switch >= 2.20.0
+Requires: gnome-applets-multiload >= 1:2.20.0
Requires: gnome-games >= 1:2.20.0.1
Requires: gnome-games-blackjack >= 1:2.20.0.1
Requires: gnome-games-extra-data >= 2.20.0
@@ -180,6 +199,7 @@
Requires: gnome-themes-extras-Foxtrot >= 2.20
Requires: gnome-themes-extras-Gion >= 2.20
Requires: gnome-themes-extras-Neu >= 2.20
+Requires: startup-notification >= 0.9
Requires: gstreamer-a52dec >= 0.10.6
Requires: gstreamer-aac >= 0.10.5
Requires: gstreamer-audio-effects-bad >= 0.10.5
@@ -227,6 +247,7 @@
Requires: gstreamer-wildmidi >= 0.10.5
Requires: gstreamer-ximagesrc >= 0.10.6
Requires: gthumb >= 2.10.6
+Requires: gnome-media-vumeter >= 2.20.1
Requires: metacity-themes-AgingGorilla >= 2:2.20.0
Requires: metacity-themes-Atlanta >= 2:2.20.0
Requires: metacity-themes-Bright >= 2:2.20.0
@@ -236,6 +257,8 @@
Requires: metacity-themes-Simple >= 2:2.20.0
Requires: nautilus-actions >= 1.4
Requires: rhythmbox >= 0.11.2
+Requires: bug-buddy >= 2.20.0
+
%description extras
Metapackage to install additional packages for GNOME Desktop.
@@ -252,6 +275,7 @@
Requires: accerciser >= 1.0.0
Requires: gnome-mag >= 0.14.10
Requires: gnome-speech >= 0.4.16
+Requires: gnome-applets-accessx-status >= 1:2.20.0
Requires: gnome-themes-HighContrast >= 2.20.0
Requires: gnome-themes-HighContrast-SVG >= 2.20.0
Requires: gnome-themes-HighContrastInverse >= 2.20.0
@@ -306,6 +330,8 @@
%files
%defattr(644,root,root,755)
+%files apps
+%defattr(644,root,root,755)
%files extras
%defattr(644,root,root,755)
%files extras-accessibility
@@ -321,7 +347,7 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log: metapackage-gnome.spec,v $
-Revision 1.26 2007-10-13 23:20:04 baggins
+Revision 1.26 2007/10/13 23:20:04 baggins
- rel 2
Revision 1.25 2007/10/12 14:22:39 sls
@@ -416,3 +442,4 @@
Revision 1.1 2004/11/13 19:52:19 aredridel
- added
+
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
