Hello community,
here is the log from the commit of package patterns-desktop for
openSUSE:Factory checked in at 2019-09-11 10:21:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/patterns-desktop (Old)
and /work/SRC/openSUSE:Factory/.patterns-desktop.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patterns-desktop"
Wed Sep 11 10:21:12 2019 rev:8 rq:728435 version:20170319
Changes:
--------
--- /work/SRC/openSUSE:Factory/patterns-desktop/patterns-desktop.changes
2018-12-31 09:43:08.298376353 +0100
+++
/work/SRC/openSUSE:Factory/.patterns-desktop.new.7948/patterns-desktop.changes
2019-09-11 10:21:13.751504540 +0200
@@ -1,0 +2,5 @@
+Wed Sep 4 07:15:23 UTC 2019 - Ludwig Nussel <[email protected]>
+
+- merge _opt patterns into main patterns
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ patterns-desktop.spec ++++++
--- /var/tmp/diff_new_pack.nGd2u7/_old 2019-09-11 10:21:15.203504360 +0200
+++ /var/tmp/diff_new_pack.nGd2u7/_new 2019-09-11 10:21:15.243504355 +0200
@@ -1,7 +1,7 @@
#
# spec file for package patterns-desktop
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -34,7 +34,7 @@
of the installation source setup. Installation of this package does
not make sense.
-TThis particular package contains all the desktop related patterns that are
not
+This particular package contains all the desktop related patterns that are not
specific too one particular desktop environment
################################################################################
@@ -117,33 +117,10 @@
Requires: pattern() = x11
Provides: patterns-openSUSE-imaging = %{version}
Obsoletes: patterns-openSUSE-imaging < %{version}
-Recommends: pattern() = imaging_opt
# from data/IMAGE
Recommends: gimp
-Suggests: exiftool
-
-%description imaging
-Handling of digital photos and graphics.
-
-%files imaging
-%dir /usr/share/doc/packages/patterns
-/usr/share/doc/packages/patterns/imaging.txt
-
-################################################################################
-
-%package imaging_opt
-%pattern_desktopfunctions
-Summary: Graphics
-Group: Metapackages
-Provides: patterns-openSUSE-imaging_opt = %{version}
-Provides: pattern() = imaging_opt
-Provides: pattern-extends() = imaging
-Provides: pattern-icon() = package_graphics
-Provides: pattern-order() = 1840
-Obsoletes: patterns-openSUSE-imaging_opt < %{version}
-Requires: pattern() = x11
-# from data/IMAGE-OPT
Recommends: gimp-help
+Suggests: exiftool
Suggests: ufraw
Suggests: gimp-ufraw
Suggests: pfstools
@@ -151,12 +128,12 @@
Suggests: pfscalibration
Suggests: calibre
-%description imaging_opt
+%description imaging
Handling of digital photos and graphics.
-%files imaging_opt
+%files imaging
%dir /usr/share/doc/packages/patterns
-/usr/share/doc/packages/patterns/imaging_opt.txt
+/usr/share/doc/packages/patterns/imaging.txt
################################################################################
@@ -205,11 +182,13 @@
Provides: pattern-order() = 1580
Provides: pattern-visible()
Obsoletes: patterns-openSUSE-multimedia < %{version}
-Recommends: pattern() = multimedia_opt
Recommends: yast2-sound
Recommends: dvd+rw-tools
Recommends: vorbis-tools
+Recommends: ImageMagick
+Recommends: mjpegtools
+Suggests: blender
Suggests: ripit
# maintained by coolo - must be good
Suggests: abcde
@@ -228,30 +207,6 @@
################################################################################
-%package multimedia_opt
-%pattern_desktopfunctions
-Summary: Multimedia
-Group: Metapackages
-Provides: patterns-openSUSE-multimedia_opt = %{version}
-Provides: pattern() = multimedia_opt
-Provides: pattern-extends() = multimedia
-Provides: pattern-icon() = yast-tv
-Provides: pattern-order() = 1560
-Obsoletes: patterns-openSUSE-multimedia_opt < %{version}
-
-Recommends: ImageMagick
-Recommends: mjpegtools
-Suggests: blender
-
-%description multimedia_opt
-Multimedia players, sound editing tools, video and image manipulation
applications.
-
-%files multimedia_opt
-%dir /usr/share/doc/packages/patterns
-/usr/share/doc/packages/patterns/multimedia_opt.txt
-
-################################################################################
-
%package technical_writing
%pattern_desktopfunctions
Summary: Technical Writing
@@ -325,7 +280,7 @@
%install
mkdir -p "%{buildroot}/usr/share/doc/packages/patterns"
-for i in books imaging imaging_opt laptop multimedia multimedia_opt \
+for i in books imaging laptop multimedia \
technical_writing; do
echo "This file marks the pattern $i to be installed." \
>"%{buildroot}/usr/share/doc/packages/patterns/$i.txt"
