From 5e073abd20bbc92675e5312a0c1dc81138c8ef75539b3888440944fa109a8b1e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 12 Dec 2018 11:55:53 +0000 Subject: [PATCH] - No longer recommend deja-dup: there are so many variants for users to maintain their backups (e.g. cloud storage) that deja-dup is no longer in the position of being uniqie. Additionally, we no longer need to pull in python2 on the default instalation (boo#1119220). OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/patterns-gnome?expand=0&rev=49 --- patterns-gnome.changes | 9 + patterns-gnome.spec | 412 ++++++++++++++++++++--------------------- 2 files changed, 208 insertions(+), 213 deletions(-) diff --git a/patterns-gnome.changes b/patterns-gnome.changes index ab1ac4f..8dae340 100644 --- a/patterns-gnome.changes +++ b/patterns-gnome.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Dec 12 11:54:01 UTC 2018 - Dominique Leuenberger + +- No longer recommend deja-dup: there are so many variants for + users to maintain their backups (e.g. cloud storage) that + deja-dup is no longer in the position of being uniqie. + Additionally, we no longer need to pull in python2 on the default + instalation (boo#1119220). + ------------------------------------------------------------------- Sun Sep 30 00:28:46 UTC 2018 - Stasiek Michalski diff --git a/patterns-gnome.spec b/patterns-gnome.spec index d6c1813..6bf8f80 100644 --- a/patterns-gnome.spec +++ b/patterns-gnome.spec @@ -17,16 +17,14 @@ %bcond_with betatest - Name: patterns-gnome Version: 20180321 Release: 0 Summary: Patterns for Installation (Gnome) License: MIT Group: Metapackages -Url: https://github.com/openSUSE/patterns +URL: https://github.com/openSUSE/patterns Source0: %{name}-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: patterns-rpm-macros %description @@ -45,11 +43,10 @@ Provides: pattern() = devel_gnome Provides: pattern-icon() = pattern-gnome-devel Provides: pattern-order() = 3160 Provides: pattern-visible() -Requires: pattern() = devel_C_C++ -Requires: pattern() = gnome_basis Provides: patterns-openSUSE-devel_gnome = %{version} Obsoletes: patterns-openSUSE-devel_gnome < %{version} - +Requires: pattern() = devel_C_C++ +Requires: pattern() = gnome_basis Recommends: cairo-devel Recommends: clutter-devel Recommends: clutter-gst-devel @@ -57,13 +54,19 @@ Recommends: clutter-gtk-devel Recommends: evolution-data-server-devel Recommends: gdk-pixbuf-devel Recommends: glib2-devel -Recommends: libgnome-desktop-3-devel +# Build tools +Recommends: gnome-common Recommends: gnome-online-accounts-devel +Recommends: gobject-introspection-devel +Recommends: gtk-doc Recommends: gtk3-devel Recommends: gtksourceview-devel +Recommends: intltool +Recommends: itstool Recommends: json-glib-devel Recommends: libcanberra-devel Recommends: libgdata-devel +Recommends: libgnome-desktop-3-devel Recommends: libgnome-keyring-devel Recommends: libgsf-devel Recommends: libgtop-devel @@ -75,14 +78,8 @@ Recommends: libwebkitgtk-devel Recommends: libwnck-devel Recommends: pango-devel Recommends: tracker-devel -Recommends: vte-devel -# Build tools -Recommends: gnome-common -Recommends: gobject-introspection-devel -Recommends: gtk-doc -Recommends: intltool -Recommends: itstool Recommends: vala +Recommends: vte-devel Recommends: yelp-tools Suggests: python-gobject-devel @@ -90,8 +87,8 @@ Suggests: python-gobject-devel GNOME development packages. %files devel_gnome -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/devel_gnome.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/devel_gnome.txt %endif %package gnome_x11 @@ -103,6 +100,68 @@ Provides: pattern-icon() = pattern-gnome-xorg Provides: pattern-order() = 1020 Provides: pattern-visible() %if 0%{?is_opensuse} +Requires: pattern() = gnome_basis +%else +# bsc#1065166 +Requires: pattern() = gnome_basic +%endif +%if 0%{?is_opensuse} +Recommends: pattern() = games +Recommends: pattern() = gnome_internet +Recommends: pattern() = gnome_utilities +Recommends: pattern() = imaging +Recommends: pattern() = multimedia +%endif +# These were not in the tumbleweed pattern +Requires: gnome-packagekit +# #545263 +Requires: seahorse +Requires: totem +Requires: xdg-user-dirs-gtk +Recommends: pattern() = gnome_imaging +Recommends: pattern() = office +Recommends: pattern() = x11_yast +# +# Official upstream +# +# no longer need to hard require cheese for g-c-c user panel +Recommends: cheese +Recommends: dconf-editor +Recommends: evince +Recommends: evolution +Recommends: evolution-ews +Recommends: gimp +Recommends: gnome-bluetooth +# bsc#1069699 +Recommends: gnome-characters +Recommends: gnome-clocks +# bsc#1069699 +Recommends: gnome-contacts +Recommends: gnome-control-center-color +Recommends: gnome-control-center-goa +Recommends: gnome-desktop +# #554954 +Recommends: gnome-disk-utility +Recommends: gnome-documents +Recommends: gnome-menus +Recommends: gpgme +# #399801 +Recommends: mousetweaks +Recommends: nautilus-sendto +Recommends: noto-sans-cjk-fonts +Recommends: orca +# bsc#1065191 +Recommends: pidgin +Recommends: planner +Recommends: python3-speechd +Recommends: speech-dispatcher +Recommends: speech-dispatcher-module-espeak +# #608156 +Recommends: tracker +Recommends: tracker-miner-files +Recommends: zenity +Suggests: pattern() = documentation +%if 0%{?is_opensuse} Provides: patterns-openSUSE-gnome = %{version} Obsoletes: patterns-openSUSE-gnome < %{version} %else @@ -110,64 +169,18 @@ Provides: patterns-sled-Default Obsoletes: patterns-sled-Default < %{version} %endif %if 0%{?is_opensuse} -Requires: pattern() = gnome_basis -%else -# bsc#1065166 -Requires: pattern() = gnome_basic -%endif -Recommends: pattern() = x11_yast -Recommends: pattern() = gnome_imaging -Recommends: pattern() = office -Suggests: pattern() = documentation -%if 0%{?is_opensuse} -Recommends: pattern() = games -Recommends: pattern() = imaging -Recommends: pattern() = gnome_internet -Recommends: pattern() = multimedia -Recommends: pattern() = gnome_utilities -%endif - -# These were not in the tumbleweed pattern -Requires: gnome-packagekit -%if 0%{?is_opensuse} Requires: vinagre %else Requires: remmina %endif -Requires: xdg-user-dirs-gtk -Recommends: dconf-editor -# bsc#1069699 -Recommends: deja-dup -Recommends: evince -Recommends: evolution-ews -Recommends: gimp -# bsc#1069699 -Recommends: gnome-characters -# bsc#1069699 -Recommends: gnome-contacts -Recommends: gnome-control-center-color -Recommends: gnome-control-center-goa -Recommends: gnome-desktop %if !0%{?is_opensuse} Recommends: gnome-initial-setup %endif -Recommends: gnome-menus -Recommends: gpgme -Recommends: noto-sans-cjk-fonts -Recommends: python3-speechd -Recommends: speech-dispatcher -Recommends: speech-dispatcher-module-espeak - %if !0%{?is_opensuse} # bsc#1075136 Recommends: gutenprint %endif # -# Official upstream -# -# no longer need to hard require cheese for g-c-c user panel -Recommends: cheese -# # #447627 %if !0%{?is_opensuse} # bsc#1087222 @@ -175,26 +188,6 @@ Recommends: gnome-user-share %else Requires: gnome-user-share %endif -# #545263 -Requires: seahorse -Requires: totem -# bsc#1065191 -Recommends: pidgin -Recommends: evolution -Recommends: gnome-clocks -# #554954 -Recommends: gnome-disk-utility -Recommends: gnome-documents -# #399801 -Recommends: mousetweaks -Recommends: nautilus-sendto -Recommends: orca -Recommends: planner -# #608156 -Recommends: tracker -Recommends: tracker-miner-files -Recommends: zenity -Recommends: gnome-bluetooth %if 0%{?is_opensuse} # # Official upstream @@ -202,8 +195,6 @@ Recommends: gnome-bluetooth # #544192 Recommends: baobab Recommends: bijiben -# #302492 -Suggests: brasero Recommends: file-roller Recommends: gcr-viewer Recommends: gedit @@ -211,25 +202,25 @@ Recommends: gnome-characters Recommends: gnome-contacts Recommends: gnome-dictionary Recommends: gnome-documents - Recommends: gnome-logs Recommends: gnome-maps Recommends: gnome-screenshot Recommends: gnome-system-monitor - -Recommends: sushi -Recommends: totem-browser-plugin -# -# Packages that really make sense -# -# Tool for advanced configuration of printers -Recommends: system-config-printer -Recommends: tracker-miner-evolution # # While running a GNOME3 session, it's nice to have the GNOME3 related pinentry # for proper gpg2 integration # Recommends: pinentry-gnome3 +Recommends: sushi +# +# Packages that really make sense +# +# Tool for advanced configuration of printers +Recommends: system-config-printer +Recommends: totem-browser-plugin +Recommends: tracker-miner-evolution +# #302492 +Suggests: brasero Suggests: dasher Suggests: gnome-backgrounds # bnc#698250 @@ -237,11 +228,11 @@ Suggests: gnome-color-manager %else # This is NetworkManager-applet in tumbleweed Recommends: NetworkManager-gnome -Recommends: desktop-data-SLE-extra +Recommends: NetworkManager-openconnect-gnome # bsc#1065148 Recommends: NetworkManager-openvpn-gnome Recommends: NetworkManager-pptp-gnome -Recommends: NetworkManager-openconnect-gnome +Recommends: desktop-data-SLE-extra %endif %description gnome_x11 @@ -251,8 +242,8 @@ Office suite, E-Mail client, Web Browser, File Manager, running with X11 technology. %files gnome_x11 -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_x11.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_x11.txt ################################################################################ @@ -261,19 +252,19 @@ technology. Summary: GNOME Desktop Environment (Wayland) Group: Metapackages Provides: pattern() = gnome -Requires: pattern() = gnome_x11 -Provides: pattern-order() = 1010 -Recommends: gnome-session-wayland Provides: pattern-icon() = pattern-gnome-wayland +Provides: pattern-order() = 1010 Provides: pattern-visible() +Requires: pattern() = gnome_x11 +Recommends: gnome-session-wayland %description gnome The GNOME desktop environment is an intuitive and attractive desktop for users. This pattern installs components for GNOME to run with Wayland and X11 technologies. %files gnome -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome.txt ################################################################################ @@ -283,21 +274,30 @@ Summary: GNOME Base System Group: Metapackages Provides: pattern() = gnome_basis Provides: pattern-icon() = pattern-gnome -Requires: pattern() = x11 %if 0%{?is_opensuse} -Recommends: pattern() = gnome_basis_opt Provides: patterns-openSUSE-gnome_basis = %{version} Obsoletes: patterns-openSUSE-gnome_basis < %{version} +Recommends: pattern() = gnome_basis_opt %endif - +Requires: pattern() = x11 Requires: gdm Requires: gnome-session +# from data/COMMON-DESKTOP +Recommends: desktop-data +Recommends: desktop-file-utils +# +# Now the real packages +# +# #332596 +Recommends: gnome-keyring-pam +# implied by gnome-keyring-pam +#Recommends: gnome-keyring +Recommends: gnome-power-manager # implied by gdm #Requires: gnome-shell #Requires: gnome-settings-daemon # implied by gnome-shell #Requires: gnome-control-center - # # Default sessions # - Put in Recommends for now, to make sure the livecd will always build; but @@ -309,6 +309,21 @@ Requires: gnome-session Recommends: gnome-session-default-session # boo#1090117 Recommends: gnome-shell-classic +Recommends: gnome-terminal +# bnc#879466 +Recommends: gnome-user-docs +Recommends: gpgme +# we need something for xdg-su +Recommends: libgnomesu +Recommends: nautilus +Recommends: polkit-default-privs +# Pulseaudio is the default sound server +Recommends: pulseaudio-module-gsettings +Recommends: pulseaudio-module-x11 +Recommends: samba +# #509829 +Recommends: xdg-user-dirs-gtk +Recommends: yelp # # Low-level parts that we need # @@ -317,36 +332,9 @@ Recommends: gnome-shell-classic Recommends: NetworkManager Recommends: NetworkManager-applet %endif -Recommends: desktop-file-utils -Recommends: gpgme -Recommends: polkit-default-privs -Recommends: samba -# -# Now the real packages -# -# #332596 -Recommends: gnome-keyring-pam %if 0%{is_opensuse} Recommends: canberra-gtk-play %endif -# bnc#879466 -Recommends: gnome-user-docs -# implied by gnome-keyring-pam -#Recommends: gnome-keyring -Recommends: gnome-power-manager -Recommends: gnome-terminal -Recommends: nautilus -Recommends: yelp -# Pulseaudio is the default sound server -Recommends: pulseaudio-module-gsettings -Recommends: pulseaudio-module-x11 -# #509829 -Recommends: xdg-user-dirs-gtk -# we need something for xdg-su -Recommends: libgnomesu - -# from data/COMMON-DESKTOP -Recommends: desktop-data %if 0%{is_opensuse} Recommends: MozillaFirefox Recommends: avahi @@ -368,8 +356,8 @@ Recommends: libsocialweb-branding-openSUSE Base packages for the GNOME desktop environment. %files gnome_basis -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_basis.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_basis.txt ################################################################################ %package gnome_basic @@ -377,24 +365,22 @@ Base packages for the GNOME desktop environment. Summary: GNOME Desktop Environment (Basic) Group: Metapackages Provides: pattern() = gnome_basic -%if !0%{?is_opensuse} -Obsoletes: patterns-sles-gnome-basic -%endif Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 1000 Provides: pattern-visible() -Requires: pattern() = basesystem -Requires: pattern() = gnome_basis %if 0%{?is_opensuse} Requires: pattern() = x11 %else Requires: pattern() = x11_enhanced %endif - +Requires: pattern() = basesystem +Requires: pattern() = gnome_basis Requires: gsettings-backend-dconf # bsc#1065945 Recommends: brasero Recommends: evince +# bsc#1069699 +Recommends: file-roller # bsc#1065146 Recommends: gedit # implified by gnome-keyring-pam @@ -408,8 +394,9 @@ Recommends: gnome-tweak-tool Recommends: nautilus-extension-terminal Recommends: nautilus-share Recommends: pinentry-gnome3 -# bsc#1069699 -Recommends: file-roller +%if !0%{?is_opensuse} +Obsoletes: patterns-sles-gnome-basic +%endif %description gnome_basic The GNOME desktop environment is an intuitive and attractive desktop for users. @@ -431,10 +418,9 @@ Provides: pattern() = gnome_basis_opt Provides: pattern-extends() = gnome_basis Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 1420 -Requires: pattern() = x11 Provides: patterns-openSUSE-gnome_basis_opt = %{version} Obsoletes: patterns-openSUSE-gnome_basis_opt < %{version} - +Requires: pattern() = x11 # #394406 Recommends: dynamic-wallpaper-branding-openSUSE # MAYBE later lsb-graphics @@ -445,8 +431,8 @@ Recommends: samba Base packages for the GNOME desktop environment. %files gnome_basis_opt -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_basis_opt.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_basis_opt.txt %endif ################################################################################ @@ -456,32 +442,32 @@ Base packages for the GNOME desktop environment. %pattern_gnomedesktop Summary: GNOME Games Group: Metapackages -Provides: patterns-openSUSE-gnome_games = %{version} Provides: pattern() = gnome_games Provides: pattern-extends() = games Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2100 +Provides: patterns-openSUSE-gnome_games = %{version} Obsoletes: patterns-openSUSE-gnome_games < %{version} -Supplements: packageand(patterns-gnome-gnome:patterns-games-games) -# from data/GNOME-Games -Recommends: iagno -Recommends: lightsoff -Recommends: quadrapassel Recommends: gnome-chess Recommends: gnome-mahjongg Recommends: gnome-mines Recommends: gnome-sudoku -Recommends: swell-foop Recommends: gnuchess +# from data/GNOME-Games +Recommends: iagno +Recommends: lightsoff +Recommends: quadrapassel +Recommends: swell-foop Suggests: gnome-games-extra-data Suggests: phalanx +Supplements: packageand(patterns-gnome-gnome:patterns-games-games) %description gnome_games GNOME Games %files gnome_games -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_games.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_games.txt %endif ################################################################################ @@ -491,10 +477,10 @@ GNOME Games %pattern_gnomedesktop Summary: GNOME Integrated Development Environment Group: Metapackages -Provides: patterns-openSUSE-gnome_ide = %{version} Provides: pattern() = gnome_ide Provides: pattern-icon() = pattern-generic Provides: pattern-order() = 2060 +Provides: patterns-openSUSE-gnome_ide = %{version} Obsoletes: patterns-openSUSE-gnome_ide < %{version} # from data/GNOME-IDE Recommends: devhelp @@ -518,8 +504,8 @@ Suggests: nemiver Development under GNOME %files gnome_ide -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_ide.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_ide.txt %endif ################################################################################ @@ -532,12 +518,7 @@ Provides: pattern() = gnome_imaging Provides: pattern-extends() = imaging Provides: pattern-icon() = package_graphics Provides: pattern-order() = 2140 -Supplements: packageand(patterns-gnome-gnome:patterns-desktop-imaging) Requires: pattern() = gnome_basis -%if 0%{?is_opensuse} -Provides: patterns-openSUSE-gnome_imaging = %{version} -Obsoletes: patterns-openSUSE-gnome_imaging < %{version} -%endif # from data/GNOME-IMAGE # # Official upstream @@ -549,13 +530,18 @@ Recommends: eog Recommends: gnome-photos Recommends: simple-scan Suggests: gthumb +Supplements: packageand(patterns-gnome-gnome:patterns-desktop-imaging) +%if 0%{?is_opensuse} +Provides: patterns-openSUSE-gnome_imaging = %{version} +Obsoletes: patterns-openSUSE-gnome_imaging < %{version} +%endif %description gnome_imaging Handling of digital photos and graphics %files gnome_imaging -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_imaging.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_imaging.txt ################################################################################ @@ -564,18 +550,13 @@ Handling of digital photos and graphics %pattern_gnomedesktop Summary: GNOME Internet Group: Metapackages -Provides: patterns-openSUSE-gnome_internet = %{version} Provides: pattern() = gnome_internet Provides: pattern-extends() = gnome Provides: pattern-icon() = package_network Provides: pattern-order() = 2420 +Provides: patterns-openSUSE-gnome_internet = %{version} Obsoletes: patterns-openSUSE-gnome_internet < %{version} -# from data/GNOME-Internet -# -# Official upstream -# -Recommends: pidgin -Recommends: evolution +Recommends: NetworkManager-openconnect-gnome # # Packages that really make sense # @@ -583,28 +564,33 @@ Recommends: evolution Recommends: NetworkManager-openvpn-gnome Recommends: NetworkManager-pptp-gnome Recommends: NetworkManager-vpnc-gnome -Recommends: NetworkManager-openconnect-gnome +Recommends: evolution +# from data/GNOME-Internet +# +# Official upstream +# +Recommends: pidgin +Recommends: polari # bnc#530416 Recommends: transmission-gtk -Recommends: polari # # Official upstream # # bnc#366894 Suggests: ekiga Suggests: epiphany +Suggests: evolution-plugin-rss # # Packages that can make sense # Suggests: frogr -Suggests: evolution-plugin-rss %description gnome_internet GNOME Internet Applications %files gnome_internet -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_internet.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_internet.txt %endif ################################################################################ @@ -617,18 +603,21 @@ Provides: pattern() = gnome_multimedia Provides: pattern-extends() = multimedia Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2200 -Supplements: packageand(patterns-gnome-gnome:patterns-desktop-multimedia) Provides: patterns-openSUSE-gnome_multimedia = %{version} Obsoletes: patterns-openSUSE-gnome_multimedia < %{version} # +# Packages that really make sense +# +Recommends: gnome-music +Recommends: gstreamer-plugins-bad +# # GStreamer magic # # software.openSUSE.org/codecs Recommends: gstreamer-plugins-base -Recommends: gstreamer-plugins-bad Recommends: gstreamer-plugins-good -Recommends: gstreamer-plugins-ugly Recommends: gstreamer-plugins-libav +Recommends: gstreamer-plugins-ugly # bnc#445314 Recommends: gstreamer-utils # @@ -638,20 +627,17 @@ Recommends: totem # # Packages that really make sense # -Recommends: gnome-music -# -# Packages that really make sense -# Suggests: paprefs Suggests: pavucontrol Suggests: pitivi +Supplements: packageand(patterns-gnome-gnome:patterns-desktop-multimedia) %description gnome_multimedia GNOME Multimedia %files gnome_multimedia -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_multimedia.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_multimedia.txt ################################################################################ @@ -664,10 +650,9 @@ Provides: pattern() = gnome_office Provides: pattern-extends() = office Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2240 -Supplements: packageand(patterns-gnome-gnome:patterns-office-office) -Requires: pattern() = gnome_basis Provides: patterns-openSUSE-gnome_office = %{version} Obsoletes: patterns-openSUSE-gnome_office < %{version} +Requires: pattern() = gnome_basis # from data/GNOME-Office # # Official upstream @@ -681,13 +666,14 @@ Recommends: libreoffice-icon-theme-tango Suggests: evolution-ews Suggests: glabels Suggests: planner +Supplements: packageand(patterns-gnome-gnome:patterns-office-office) %description gnome_office GNOME Office %files gnome_office -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_office.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_office.txt %endif ################################################################################ @@ -701,32 +687,32 @@ Provides: pattern() = gnome_utilities Provides: pattern-extends() = gnome Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2280 -Requires: pattern() = gnome_basis Provides: patterns-openSUSE-gnome_utilities = %{version} Obsoletes: patterns-openSUSE-gnome_utilities < %{version} +Requires: pattern() = gnome_basis # # Official upstream # Recommends: baobab +Recommends: bijiben Recommends: cheese Recommends: file-roller +Recommends: gdk-pixbuf-thumbnailer Recommends: gedit Recommends: gnome-calculator Recommends: gnome-characters Recommends: gnome-dictionary Recommends: gnome-screenshot -Recommends: nautilus-extension-seahorse -Recommends: nautilus-sendto -Recommends: seahorse -Recommends: bijiben # # Packages that really make sense # Recommends: gnome-tweak-tool -Recommends: gsf-office-thumbnailer -Recommends: gdk-pixbuf-thumbnailer -Recommends: rsvg-thumbnailer Recommends: gnome-weather +Recommends: gsf-office-thumbnailer +Recommends: nautilus-extension-seahorse +Recommends: nautilus-sendto +Recommends: rsvg-thumbnailer +Recommends: seahorse # # Official upstream # @@ -744,8 +730,8 @@ Suggests: nautilus-share GNOME Utilities %files gnome_utilities -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_utilities.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_utilities.txt %endif ################################################################################ @@ -759,18 +745,18 @@ Provides: pattern() = gnome_yast Provides: pattern-extends() = yast2_basis Provides: pattern-icon() = pattern-generic Provides: pattern-order() = 1260 -Supplements: packageand(patterns-gnome-gnome:patterns-yast-yast2_basis) Provides: patterns-openSUSE-gnome_yast = %{version} Obsoletes: patterns-openSUSE-gnome_yast < %{version} Requires: libyui-qt-pkg Requires: yast2-control-center-qt +Supplements: packageand(patterns-gnome-gnome:patterns-yast-yast2_basis) %description gnome_yast Graphical YaST user interfaces for the GNOME desktop. %files gnome_yast -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_yast.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_yast.txt %endif ################################################################################ @@ -784,20 +770,20 @@ Provides: pattern() = sw_management_gnome Provides: pattern-extends() = sw_management Provides: pattern-icon() = pattern-generic Provides: pattern-order() = 1780 -Supplements: packageand(patterns-gnome-gnome_basis:patterns-base-sw_management) -Requires: pattern() = sw_management -Requires: pattern() = x11 Provides: patterns-openSUSE-sw_management_gnome = %{version} Obsoletes: patterns-openSUSE-sw_management_gnome < %{version} +Requires: pattern() = sw_management +Requires: pattern() = x11 Recommends: gnome-packagekit Recommends: gnome-software +Supplements: packageand(patterns-gnome-gnome_basis:patterns-base-sw_management) %description sw_management_gnome Package Management - Graphical Tools %files sw_management_gnome -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/sw_management_gnome.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/sw_management_gnome.txt %endif %prep @@ -806,10 +792,10 @@ Package Management - Graphical Tools %install -mkdir -p "%{buildroot}/usr/share/doc/packages/patterns" +mkdir -p "%{buildroot}%{_docdir}/patterns" for i in gnome gnome_basis gnome_basic gnome_imaging gnome_x11 gnome_multimedia; do echo "This file marks the pattern $i to be installed." \ - >"%{buildroot}/usr/share/doc/packages/patterns/$i.txt" + >"%{buildroot}%{_docdir}/patterns/$i.txt" done %if 0%{?is_opensuse} @@ -818,7 +804,7 @@ for i in devel_gnome gnome_basis_opt \ gnome_office \ gnome_utilities gnome_yast sw_management_gnome; do echo "This file marks the pattern $i to be installed." \ - >"%{buildroot}/usr/share/doc/packages/patterns/$i.txt" + >"%{buildroot}%{_docdir}/patterns/$i.txt" done %endif