diff --git a/patterns-gnome.spec b/patterns-gnome.spec
index b017940..0c99621 100644
--- a/patterns-gnome.spec
+++ b/patterns-gnome.spec
@@ -17,14 +17,16 @@
 
 
 %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
@@ -43,10 +45,11 @@ Provides:       pattern() = devel_gnome
 Provides:       pattern-icon() = pattern-gnome-devel
 Provides:       pattern-order() = 3160
 Provides:       pattern-visible()
-Provides:       patterns-openSUSE-devel_gnome = %{version}
-Obsoletes:      patterns-openSUSE-devel_gnome < %{version}
 Requires:       pattern() = devel_C_C++
 Requires:       pattern() = gnome_basis
+Provides:       patterns-openSUSE-devel_gnome = %{version}
+Obsoletes:      patterns-openSUSE-devel_gnome < %{version}
+
 Recommends:     cairo-devel
 Recommends:     clutter-devel
 Recommends:     clutter-gst-devel
@@ -54,19 +57,13 @@ Recommends:     clutter-gtk-devel
 Recommends:     evolution-data-server-devel
 Recommends:     gdk-pixbuf-devel
 Recommends:     glib2-devel
-# Build tools
-Recommends:     gnome-common
+Recommends:     libgnome-desktop-3-devel
 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
@@ -78,8 +75,14 @@ Recommends:     libwebkitgtk-devel
 Recommends:     libwnck-devel
 Recommends:     pango-devel
 Recommends:     tracker-devel
-Recommends:     vala
 Recommends:     vte-devel
+# Build tools
+Recommends:     gnome-common
+Recommends:     gobject-introspection-devel
+Recommends:     gtk-doc
+Recommends:     intltool
+Recommends:     itstool
+Recommends:     vala
 Recommends:     yelp-tools
 Suggests:       python-gobject-devel
 
@@ -87,8 +90,8 @@ Suggests:       python-gobject-devel
 GNOME development packages.
 
 %files devel_gnome
-%dir %{_docdir}/patterns
-%{_docdir}/patterns/devel_gnome.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/devel_gnome.txt
 %endif
 
 %package gnome_x11
@@ -100,76 +103,6 @@ Provides:       pattern-icon() = pattern-gnome_x11
 Provides:       pattern-order() = 1010
 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
-# #447627
-Requires:       gnome-user-share
-# #545263
-Requires:       seahorse
-Requires:       totem
-Requires:       xdg-user-dirs-gtk
-Recommends:     pattern() = gnome_imaging
-Recommends:     pattern() = office
-Recommends:     pattern() = x11_yast
-# bnc#366894
-Recommends:     caribou
-#
-# Official upstream
-#
-# no longer need to hard require cheese for g-c-c user panel
-Recommends:     cheese
-Recommends:     dconf-editor
-# bsc#1069699
-Recommends:     deja-dup
-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-icon-theme
-Recommends:     gnote
-Recommends:     gpgme
-# #399801
-Recommends:     mousetweaks
-Recommends:     nautilus-eiciel
-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
@@ -177,13 +110,85 @@ 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
-%if %{?sle_version}
+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
+Recommends:     gnome-icon-theme
+%if 0%{?sle_version}
 Recommends:     gnome-initial-setup
 %endif
+Recommends:     gnote
+Recommends:     gpgme
+Recommends:     nautilus-eiciel
+Recommends:     noto-sans-cjk-fonts
+Recommends:     python3-speechd
+Recommends:     speech-dispatcher
+Recommends:     speech-dispatcher-module-espeak
+
+#
+# Official upstream
+#
+# no longer need to hard require cheese for g-c-c user panel
+Recommends:     cheese
+# #447627
+Requires:       gnome-user-share
+# #545263
+Requires:       seahorse
+Requires:       totem
+# bnc#366894
+Recommends:     caribou
+# 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
@@ -191,6 +196,8 @@ Recommends:     gnome-initial-setup
 # #544192
 Recommends:     baobab
 Recommends:     bijiben
+# #302492
+Suggests:       brasero
 Recommends:     file-roller
 Recommends:     gcr-viewer
 Recommends:     gedit
@@ -198,25 +205,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
-#
-# While running a GNOME3 session, it's nice to have the GNOME3 related pinentry
-# for proper gpg2 integration
-#
-Recommends:     pinentry-gnome3
+
 Recommends:     sushi
+Recommends:     totem-browser-plugin
 #
 # 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
+#
+# While running a GNOME3 session, it's nice to have the GNOME3 related pinentry
+# for proper gpg2 integration
+#
+Recommends:     pinentry-gnome3
 Suggests:       dasher
 Suggests:       gconf-editor
 Suggests:       gnome-backgrounds
@@ -225,11 +232,11 @@ Suggests:       gnome-color-manager
 %else
 # This is NetworkManager-applet in tumbleweed
 Recommends:     NetworkManager-gnome
-Recommends:     NetworkManager-openconnect-gnome
+Recommends:     desktop-data-SLE-extra
 # bsc#1065148
 Recommends:     NetworkManager-openvpn-gnome
 Recommends:     NetworkManager-pptp-gnome
-Recommends:     desktop-data-SLE-extra
+Recommends:     NetworkManager-openconnect-gnome
 %endif
 
 %description gnome_x11
@@ -237,8 +244,8 @@ The GNOME desktop environment is an intuitive and attractive desktop for users.
 This pattern installs components for GNOME to run with X11 technology.
 
 %files gnome_x11
-%dir %{_docdir}/patterns
-%{_docdir}/patterns/gnome_x11.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/gnome_x11.txt
 
 ################################################################################
 
@@ -247,8 +254,8 @@ This pattern installs components for GNOME to run with X11 technology.
 Summary:        GNOME Desktop Environment (Wayland)
 Group:          Metapackages
 Provides:       pattern() = gnome
-Provides:       pattern-order() = 2040
 Requires:       pattern() = gnome_x11
+Provides:       pattern-order() = 2040
 Recommends:     gnome-session-wayland
 
 %description gnome
@@ -256,8 +263,8 @@ 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 %{_docdir}/patterns
-%{_docdir}/patterns/gnome.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/gnome.txt
 
 ################################################################################
 
@@ -268,30 +275,21 @@ Group:          Metapackages
 Provides:       pattern() = gnome_basis
 Provides:       pattern-icon() = pattern-gnome
 Provides:       pattern-order() = 1000
+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
@@ -301,20 +299,6 @@ Recommends:     gnome-power-manager
 #   somehow a bit usable
 #
 Recommends:     gnome-session-default-session
-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
-Recommends:     pulseaudio-module-gconf
-Recommends:     pulseaudio-module-x11
-Recommends:     samba
-# #509829
-Recommends:     xdg-user-dirs-gtk
-Recommends:     yelp
 #
 # Low-level parts that we need
 #
@@ -323,15 +307,41 @@ Recommends:     yelp
 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
 %if 0%{is_opensuse}
 Recommends:     pulseaudio-module-bluetooth
 Recommends:     pulseaudio-module-lirc
 Recommends:     pulseaudio-module-zeroconf
 %endif
+Recommends:     pulseaudio-module-gconf
+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
@@ -354,8 +364,8 @@ Recommends:     libsocialweb-branding-openSUSE
 Base packages for the GNOME desktop environment.
 
 %files gnome_basis
-%dir %{_docdir}/patterns
-%{_docdir}/patterns/gnome_basis.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/gnome_basis.txt
 
 ################################################################################
 %package gnome_basic
@@ -363,38 +373,39 @@ Base packages for the GNOME desktop environment.
 Summary:        GNOME Desktop Environment
 Group:          Metapackages
 Provides:       pattern() = gnome_basic
+%if !0%{?is_opensuse}
+Obsoletes:      patterns-sles-gnome-basic
+%endif
 Provides:       pattern-icon() = pattern-gnome
 Provides:       pattern-order() = 1010
 Provides:       pattern-visible()
-# ENDTEST
-Requires:       pattern() = basesystem
 # TEST
 Requires:       pattern() = gnome_basis
+# ENDTEST
+Requires:       pattern() = basesystem
 Requires:       pattern() = x11_enhanced
+
 Requires:       gsettings-backend-dconf
 # bsc#1065945
 Recommends:     brasero
 Recommends:     evince
-# bsc#1069699
-Recommends:     file-roller
-Recommends:     gconf-editor
 # bsc#1065146
 Recommends:     gedit
+Recommends:     gnome-shell-classic
 # implified by gnome-keyring-pam
 # Recommends:     gnome-keyring
 # bsc#1063156
 Recommends:     gnome-calculator
-Recommends:     gnome-shell-classic
 Recommends:     gnome-software
+Recommends:     gconf-editor
 Recommends:     gnome-system-monitor
 # bnc#859494 bsc#1065790
 Recommends:     gnome-tweak-tool
 Recommends:     nautilus-extension-terminal
 Recommends:     nautilus-share
 Recommends:     pinentry-gnome3
-%if !0%{?is_opensuse}
-Obsoletes:      patterns-sles-gnome-basic
-%endif
+# bsc#1069699
+Recommends:     file-roller
 
 %description gnome_basic
 The GNOME desktop environment is an intuitive and attractive desktop for users.
@@ -414,9 +425,10 @@ 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
@@ -427,8 +439,8 @@ Recommends:     samba
 Base packages for the GNOME desktop environment.
 
 %files gnome_basis_opt
-%dir %{_docdir}/patterns
-%{_docdir}/patterns/gnome_basis_opt.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/gnome_basis_opt.txt
 %endif
 
 ################################################################################
@@ -438,32 +450,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}
-Recommends:     gnome-chess
-Recommends:     gnome-mahjongg
-Recommends:     gnome-mines
-Recommends:     gnome-sudoku
-Recommends:     gnuchess
+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
 Suggests:       gnome-games-extra-data
 Suggests:       phalanx
-Supplements:    packageand(patterns-gnome-gnome:patterns-games-games)
 
 %description gnome_games
 GNOME Games
 
 %files gnome_games
-%dir %{_docdir}/patterns
-%{_docdir}/patterns/gnome_games.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/gnome_games.txt
 %endif
 
 ################################################################################
@@ -473,10 +485,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
@@ -500,8 +512,8 @@ Suggests:       nemiver
 Development under GNOME
 
 %files gnome_ide
-%dir %{_docdir}/patterns
-%{_docdir}/patterns/gnome_ide.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/gnome_ide.txt
 %endif
 
 ################################################################################
@@ -514,7 +526,12 @@ 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
@@ -526,18 +543,13 @@ 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 %{_docdir}/patterns
-%{_docdir}/patterns/gnome_imaging.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/gnome_imaging.txt
 
 ################################################################################
 
@@ -546,13 +558,18 @@ 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}
-Recommends:     NetworkManager-openconnect-gnome
+# from data/GNOME-Internet
+#
+# Official upstream
+#
+Recommends:     pidgin
+Recommends:     evolution
 #
 # Packages that really make sense
 #
@@ -560,33 +577,28 @@ Recommends:     NetworkManager-openconnect-gnome
 Recommends:     NetworkManager-openvpn-gnome
 Recommends:     NetworkManager-pptp-gnome
 Recommends:     NetworkManager-vpnc-gnome
-Recommends:     evolution
-# from data/GNOME-Internet
-#
-# Official upstream
-#
-Recommends:     pidgin
-Recommends:     polari
+Recommends:     NetworkManager-openconnect-gnome
 # 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 %{_docdir}/patterns
-%{_docdir}/patterns/gnome_internet.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/gnome_internet.txt
 %endif
 
 ################################################################################
@@ -600,21 +612,18 @@ 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-libav
 Recommends:     gstreamer-plugins-ugly
+Recommends:     gstreamer-plugins-libav
 # bnc#445314
 Recommends:     gstreamer-utils
 #
@@ -625,17 +634,20 @@ Recommends:     totem-browser-plugin
 #
 # 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 %{_docdir}/patterns
-%{_docdir}/patterns/gnome_multimedia.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/gnome_multimedia.txt
 %endif
 
 ################################################################################
@@ -649,9 +661,10 @@ 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
@@ -665,14 +678,13 @@ 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 %{_docdir}/patterns
-%{_docdir}/patterns/gnome_office.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/gnome_office.txt
 %endif
 
 ################################################################################
@@ -686,32 +698,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:     gnome-weather
 Recommends:     gsf-office-thumbnailer
-Recommends:     nautilus-extension-seahorse
-Recommends:     nautilus-sendto
+Recommends:     gdk-pixbuf-thumbnailer
 Recommends:     rsvg-thumbnailer
-Recommends:     seahorse
+Recommends:     gnome-weather
 #
 # Official upstream
 #
@@ -729,8 +741,8 @@ Suggests:       nautilus-share
 GNOME Utilities
 
 %files gnome_utilities
-%dir %{_docdir}/patterns
-%{_docdir}/patterns/gnome_utilities.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/gnome_utilities.txt
 %endif
 
 ################################################################################
@@ -744,18 +756,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 %{_docdir}/patterns
-%{_docdir}/patterns/gnome_yast.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/gnome_yast.txt
 %endif
 
 ################################################################################
@@ -769,20 +781,20 @@ Provides:       pattern() = sw_management_gnome
 Provides:       pattern-extends() = sw_management
 Provides:       pattern-icon() = pattern-generic
 Provides:       pattern-order() = 1780
-Provides:       patterns-openSUSE-sw_management_gnome = %{version}
-Obsoletes:      patterns-openSUSE-sw_management_gnome < %{version}
+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}
 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 %{_docdir}/patterns
-%{_docdir}/patterns/sw_management_gnome.txt
+%dir /usr/share/doc/packages/patterns
+/usr/share/doc/packages/patterns/sw_management_gnome.txt
 %endif
 
 %prep
@@ -791,10 +803,10 @@ Package Management - Graphical Tools
 
 %install
 
-mkdir -p "%{buildroot}%{_docdir}/patterns"
+mkdir -p "%{buildroot}/usr/share/doc/packages/patterns"
 for i in gnome gnome_basis gnome_basic gnome_imaging gnome_x11; do
 	echo "This file marks the pattern $i to be installed." \
-		>"%{buildroot}%{_docdir}/patterns/$i.txt"
+		>"%{buildroot}/usr/share/doc/packages/patterns/$i.txt"
 done
 
 %if 0%{?is_opensuse}
@@ -803,7 +815,7 @@ for i in devel_gnome gnome_basis_opt \
     gnome_multimedia gnome_office \
     gnome_utilities gnome_yast sw_management_gnome; do
 	echo "This file marks the pattern $i to be installed." \
-		>"%{buildroot}%{_docdir}/patterns/$i.txt"
+		>"%{buildroot}/usr/share/doc/packages/patterns/$i.txt"
 done
 %endif