Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Leap:15.2 checked in at 2020-02-11 23:24:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/branding-openSUSE (Old) and /work/SRC/openSUSE:Leap:15.2/.branding-openSUSE.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "branding-openSUSE" Tue Feb 11 23:24:32 2020 rev:41 rq:769402 version:15.2.20200203 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/branding-openSUSE/branding-openSUSE.changes 2020-01-15 14:48:55.653360607 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.branding-openSUSE.new.26092/branding-openSUSE.changes 2020-02-11 23:24:44.777249117 +0100 @@ -1,0 +2,5 @@ +Mon Feb 3 00:23:06 UTC 2020 - Stasiek Michalski <stas...@michalski.cc> + +- Sync with Tumbleweed + +------------------------------------------------------------------- Old: ---- openSUSE.tar.xz New: ---- branding-leap-15.2.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.k3zH6j/_old 2020-02-11 23:24:45.309249393 +0100 +++ /var/tmp/diff_new_pack.k3zH6j/_new 2020-02-11 23:24:45.313249396 +0100 @@ -1,7 +1,8 @@ # # spec file for package branding-openSUSE # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 Stasiek Michalski <stas...@michalski.cc>. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,181 +13,175 @@ # 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/ # -Name: branding-openSUSE -Version: 15.2 -Release: 0 -Provides: branding -Conflicts: otherproviders(branding) -Url: http://github.com/openSUSE/branding -Source0: openSUSE.tar.xz -%ifarch x86_64 %ix86 -%define package_gfxboot 1 -BuildRequires: gfxboot-devel +%define theme_name openSUSE +%define theme_version leap-15.2 +%define theme_version_clean Leap 15.2 +%define date 20200203 + +%ifarch x86_64 %{ix86} +%define gfxboot 1 %endif -%ifarch %arm aarch64 %{ix86} x86_64 ppc ppc64 -%define package_grub2_theme 1 -BuildRequires: grub2 + +%ifarch %{arm} aarch64 %{ix86} x86_64 ppc ppc64 +%define grub2 1 %endif -Summary: openSUSE Brand File -License: BSD-3-Clause AND CC-BY-SA-3.0 AND GPL-2.0+ -Group: System/Fhs + +Name: branding-%{theme_name} +Version: 15.2.%{date} +Release: 0 +Summary: %{theme_name} %{theme_version_clean} Brand File +License: BSD-3-Clause AND CC-BY-SA-3.0 AND GPL-2.0-or-later +URL: https://github.com/openSUSE/branding +Source0: branding-%{theme_version}.zip +BuildRequires: GraphicsMagick +BuildRequires: distribution-logos-openSUSE-Leap BuildRequires: fdupes BuildRequires: fribidi +BuildRequires: optipng +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 +# rsvg-convert used to be packaged together with rsvg-view in one package. With the removal +# of the rsvg-view program, this package was renamed to rsvg-convert (which is more fitting) +BuildRequires: rsvg-convert +%else +BuildRequires: rsvg-view +%endif +BuildRequires: suse-module-tools +BuildRequires: unzip BuildRequires: update-desktop-files +Conflicts: branding +Provides: branding +BuildArch: noarch %if 0%{?suse_version} > 1320 BuildRequires: update-bootloader-rpm-macros %endif -BuildRequires: suse-module-tools -BuildArch: noarch -Obsoletes: dynamic-wallpaper-branding-openSUSE <= 13.2 %description -This package contains the file /etc/SUSE-brand, and its name is used as +This package contains the file %{_sysconfdir}/SUSE-brand, and its name is used as a trigger for installation of correct vendor brand packages. -%define theme_name openSUSE - -%if 0%{?package_gfxboot} > 0 - -%package -n gfxboot-branding-openSUSE -Summary: Graphical bootloader openSUSE theme -License: BSD-3-Clause -Group: System/Boot -PreReq: gfxboot >= 4 -Supplements: packageand(gfxboot:branding-openSUSE) -Provides: gfxboot-branding = %{version} -Provides: gfxboot-theme = %{version} -Conflicts: otherproviders(gfxboot-branding) -BuildArch: noarch - -%description -n gfxboot-branding-openSUSE -openSUSE theme for gfxboot (graphical bootloader for grub). -%endif - -%package -n wallpaper-branding-openSUSE -Summary: openSUSE default wallpapers +%package -n wallpaper-branding-%{theme_name} +Summary: %{theme_name} %{theme_version_clean} default wallpapers License: BSD-3-Clause -Group: System/Fhs Requires(post): update-alternatives Requires(postun): update-alternatives +Conflicts: wallpaper-branding Provides: wallpaper-branding = %{version} -Conflicts: otherproviders(wallpaper-branding) BuildArch: noarch -%description -n wallpaper-branding-openSUSE -openSUSE %{version} defaults wallpapers +%description -n wallpaper-branding-%{theme_name} +%{theme_name} %{theme_version_clean} defaults wallpapers -%package -n libreoffice-branding-openSUSE -Summary: openSUSE branding for LibreOffice +%package -n libreoffice-branding-%{theme_name} +Summary: %{theme_name} %{theme_version_clean} branding for LibreOffice License: BSD-3-Clause -Group: Productivity/Office/Suite -Supplements: libreoffice +Supplements: (libreoffice and branding-%{theme_name}) Conflicts: libreoffice-branding Provides: libreoffice-branding = %{version} BuildArch: noarch -%description -n libreoffice-branding-openSUSE -openSUSE %{version} branding for LibreOffice +%description -n libreoffice-branding-%{theme_name} +%{theme_name} %{theme_version_clean} branding for LibreOffice -%package -n yast2-qt-branding-openSUSE -Summary: openSUSE branding for yast2-qt +%package -n yast2-qt-branding-%{theme_name} +Summary: %{theme_name} %{theme_version_clean} branding for YaST2 Qt License: BSD-3-Clause -Group: System/Fhs Requires: adobe-sourcesanspro-fonts +Requires: distribution-logos Requires: google-opensans-fonts +Supplements: (libyui-qt and branding-%{theme_name}) +Conflicts: yast2-qt-branding Provides: yast2-qt-branding = %{version} -Conflicts: otherproviders(yast2-qt-branding) BuildArch: noarch -%description -n yast2-qt-branding-openSUSE -openSUSE %{version} branding and themes for yast2-qt +%description -n yast2-qt-branding-%{theme_name} +%{theme_name} %{theme_version_clean} branding for YaST2 Qt, mainly used for installation %package -n icewm-theme-yast-installation -Summary: Theme configuration for IceWM during the installation +Summary: %{theme_name} %{theme_version_clean} branding for IceWM during the installation License: BSD-3-Clause AND CC-BY-SA-3.0 AND GPL-2.0-or-later -Group: System/Fhs +Supplements: ((yast-installation and icewm) and branding-%{theme_name}) Conflicts: icewm-theme-branding +BuildArch: noarch %description -n icewm-theme-yast-installation -This IceWM theme is specifically tailored to the openSUSE installation +This IceWM theme is specifically tailored to the %{theme_name} installation process using YaST2 - -%package -n xfce4-splash-branding-openSUSE -Summary: openSUSE branding for XFCE splash -License: CC-BY-SA-3.0 -Group: System/Fhs -BuildArch: noarch -Provides: xfce4-splash-branding = %{version} -Conflicts: otherproviders(xfce4-splash-branding) - -%description -n xfce4-splash-branding-openSUSE -openSUSE %{version} branding for the XFCE splash - -%package -n systemd-icon-branding-openSUSE -Summary: Icons used with systemd +%package -n systemd-icon-branding-%{theme_name} +Summary: %{theme_name} %{theme_version_clean} icons for systemd License: CC-BY-SA-3.0 -Group: System/Fhs +Requires: distribution-logos +Supplements: (systemd and branding-%{theme_name}) +Provides: systemd-icon-branding = %{version} Conflicts: systemd-icon-branding +BuildArch: noarch -%description -n systemd-icon-branding-openSUSE -Those icons are designed to represent openSUSE with systemd osrelease +%description -n systemd-icon-branding-%{theme_name} +%{theme_name} %{theme_version_clean} icons for systemd os-release LOGO variable -%if 0%{?package_grub2_theme} > 0 - -%package -n grub2-branding-openSUSE -Summary: openSUSE branding for GRUB2's graphical console +%if 0%{?grub2} > 0 +%package -n grub2-branding-%{theme_name} +Summary: %{theme_name} %{theme_version_clean} branding for GRUB2 License: CC-BY-SA-3.0 -Group: System/Fhs -%if 0%{?update_bootloader_requires:1} -%update_bootloader_requires -%endif -# grub2 is required in all cases in order to have /etc/default/grub in place during post. -# Otherwise it may happen that grub2 is installed after the branding packae. Requires: grub2 +BuildRequires: grub2 +Supplements: (grub2 and branding-%{theme_name}) +Conflicts: grub2-branding Provides: grub2-branding = %{version} -Supplements: packageand(grub2:branding-openSUSE) -Conflicts: otherproviders(grub2-branding) BuildArch: noarch +%if 0%{?update_bootloader_requires:1} +%{update_bootloader_requires} +%endif -%description -n grub2-branding-openSUSE -openSUSE %{version} branding for the GRUB2's graphical console +%description -n grub2-branding-%{theme_name} +%{theme_name} %{theme_version_clean} branding for the GRUB2's graphical console +%endif +%if 0%{?gfxboot} > 0 +%package -n gfxboot-branding-%{theme_name} +Summary: %{theme_name} %{theme_version_clean} branding for gfxboot +License: BSD-3-Clause +BuildRequires: gfxboot-devel +PreReq: gfxboot >= 4 +Requires(post): gfxboot >= 4 +Supplements: (gfxboot and branding-openSUSE) +Conflicts: gfxboot-branding +Provides: gfxboot-branding = %{version} +Provides: gfxboot-theme = %{version} +BuildArch: noarch + +%description -n gfxboot-branding-%{theme_name} +%{theme_name} %{theme_version_clean} branding for gfxboot (graphical bootloader for grub). %endif -%package -n plymouth-branding-openSUSE -Summary: openSUSE branding for Plymouth bootsplash -License: GPL-2.0+ -Group: System/Fhs -PreReq: plymouth-plugin-script +%package -n plymouth-branding-%{theme_name} +Summary: %{theme_name} %{theme_version_clean} branding for Plymouth bootsplash +License: GPL-2.0-or-later +BuildRequires: plymouth-theme-bgrt +Requires: distribution-logos +Requires: plymouth-theme-bgrt +PreReq: plymouth-theme-bgrt PreReq: plymouth-scripts -BuildRequires: plymouth-plugin-two-step -Requires: plymouth-plugin-two-step -Requires(%post): plymouth-plugin-two-step -Supplements: packageand(plymouth:branding-openSUSE) +Supplements: (plymouth and branding-%{theme_name}) +Conflicts: plymouth-branding Provides: plymouth-branding = %{version} -Conflicts: otherproviders(plymouth-branding) BuildArch: noarch -%description -n plymouth-branding-openSUSE -openSUSE %{version} branding for the plymouth bootsplash +%description -n plymouth-branding-%{theme_name} +%{theme_name} %{theme_version_clean} branding for the plymouth bootsplash %prep -%setup -q -c -cp -a openSUSE/LICENSE COPYING +%autosetup -p1 -n branding-%{theme_version} %build -cat >SUSE-brand <<EOF -openSUSE -VERSION = %{version} -EOF +%make_build -%if 0%{?package_gfxboot} > 0 +%if 0%{?gfxboot} > 0 mkdir gfx cp -a %{_datadir}/gfxboot/themes/openSUSE/ gfx list=`cd openSUSE/gfxboot && find -type f` @@ -194,17 +189,20 @@ cp openSUSE/gfxboot/$i gfx/openSUSE/$i done pushd gfx/openSUSE -sed -i -e "s,product=.*,product=openSUSE Leap %{version}," config +%if 0%{?sle_version} + sed -i -e "s,product=.*,product=%{theme_name} %{theme_version_clean}," config +%else + sed -i -e "s,product=.*,product=%{theme_name} %{theme_version_clean}," config +%endif perl -pi -e 's/^(welcome=).*/${1}3/' src/gfxboot.cfg -export PATH=%{_sbindir}:$PATH -make +export PATH=%{_prefix}/sbin:$PATH +make %{?_smp_mflags} BINDIR="/usr/sbin/" popd %endif %install -mkdir -p %{buildroot}%{_sysconfdir} -cp SUSE-brand %{buildroot}%{_sysconfdir}/ +%make_install # gfxboot themes will soon get a make install - promised by snwint # gfxboot should use a link /etc/bootsplash/theme -> /usr/share/bootsplash @@ -215,141 +213,110 @@ %{_datadir}/gfxboot/bin/unpack_bootlogo %{buildroot}%{_sysconfdir}/bootsplash/themes/openSUSE/cdrom install -m 644 gfx/openSUSE/{message,po/*.tr,help-boot/*.hlp} %{buildroot}%{_sysconfdir}/bootsplash/themes/openSUSE/bootloader %{_datadir}/gfxboot/bin/2hl --link --quiet %{buildroot}%{_sysconfdir}/bootsplash/themes/openSUSE/* - mkdir %{buildroot}/boot touch %{buildroot}/boot/message fi -make -C openSUSE install DESTDIR=%{buildroot} - for i in %{buildroot}%{_datadir}/wallpapers/*.desktop; do %suse_update_desktop_file "$i" done -%suse_update_desktop_file %{buildroot}%{_datadir}/wallpapers/openSUSEdefault/metadata.desktop -# Touch the file handled with update-alternatives -touch %{buildroot}%{_datadir}/wallpapers/openSUSE-default.xml - -# try how far we get without them -rm -v %{buildroot}%{_datadir}/wallpapers/openSUSE*desktop %{buildroot}%{_datadir}/wallpapers/openSUSE*jpg %{buildroot}%{_datadir}/wallpapers/default* -%fdupes %{buildroot}%{_datadir}/backgrounds - -ln -sf %{_datadir}/wallpapers/openSUSE-default-static.xml %{buildroot}%{_datadir}/wallpapers/openSUSE-default-dynamic.xml - -# remove -%if 0%{?package_grub2_theme} < 1 -rm -rf %{buildroot}/%{_datadir}/grub2 -%endif -%check -make -C openSUSE check DESTDIR=%{buildroot} +%fdupes -s %{buildroot}%{_datadir}/wallpapers/ +%fdupes -s %{buildroot}%{_datadir}/YaST2/theme/current/wizard/ -%if 0%{?package_gfxboot} > 0 +%suse_update_desktop_file %{buildroot}%{_datadir}/wallpapers/openSUSEdefault/metadata.desktop -%post -n gfxboot-branding-openSUSE -gfxboot --update-theme openSUSE +%if 0%{?grub2} < 1 +rm -rf %{buildroot}%{_datadir}/grub2 %endif -%post -n wallpaper-branding-openSUSE +%post -n wallpaper-branding-%{theme_name} update-alternatives --install %{_datadir}/wallpapers/openSUSE-default.xml openSUSE-default.xml %{_datadir}/wallpapers/openSUSE-default-static.xml 5 -%postun -n wallpaper-branding-openSUSE +%postun -n wallpaper-branding-%{theme_name} # Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed if [ ! -f %{_datadir}/wallpapers/openSUSE-default-static.xml ]; then update-alternatives --remove openSUSE-default.xml %{_datadir}/wallpapers/openSUSE-default-static.xml fi -%if 0%{?package_grub2_theme} > 0 -%post -n grub2-branding-openSUSE -%{_datadir}/grub2/themes/%theme_name/activate-theme +%if 0%{?grub2} > 0 +%post -n grub2-branding-%{theme_name} +%{_datadir}/grub2/themes/%{theme_name}/activate-theme %if 0%{?update_bootloader_check_type_refresh_post:1} -%update_bootloader_check_type_refresh_post grub2 grub2-efi +%{update_bootloader_check_type_refresh_post grub2 grub2-efi} %else if test -e /boot/grub2/grub.cfg ; then %{_sbindir}/grub2-mkconfig -o /boot/grub2/grub.cfg || true fi %endif -%posttrans -n grub2-branding-openSUSE +%posttrans -n grub2-branding-%{theme_name} %{?update_bootloader_posttrans} -%postun -n grub2-branding-openSUSE +%postun -n grub2-branding-%{theme_name} if [ $1 = 0 ] ; then - rm -rf /boot/grub2/themes/%theme_name + rm -rf /boot/grub2/themes/%{theme_name} fi %endif -%post -n plymouth-branding-openSUSE -OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" -if [ "$OTHEME" == "text" -o "$OTHEME" == "openSUSE" -o "$OTHEME" == "basedonopensuse" ]; then - if [ ! -e /.buildenv ]; then - %{_sbindir}/plymouth-set-default-theme openSUSE - %{?regenerate_initrd_post} - else - %{_sbindir}/plymouth-set-default-theme openSUSE - fi -fi - -%postun -n plymouth-branding-openSUSE -if [ $1 -eq 0 ]; then - if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" ]; then - %{_sbindir}/plymouth-set-default-theme --reset - %{?regenerate_initrd_post} - fi -fi - -%posttrans -n plymouth-branding-openSUSE -%{?regenerate_initrd_posttrans} +%if 0%{?gfxboot} > 0 +%post -n gfxboot-branding-%{theme_name} +gfxboot --update-theme %{theme_name} +%endif %files -%doc COPYING -%{_sysconfdir}/SUSE-brand - -%if 0%{?package_gfxboot} > 0 - -%files -n gfxboot-branding-openSUSE -%{_sysconfdir}/bootsplash -%ghost /boot/message -%endif +%license LICENSE +%config %{_sysconfdir}/SUSE-brand -%files -n wallpaper-branding-openSUSE -%doc COPYING -%ghost %{_datadir}/wallpapers/openSUSE-default.xml +%files -n wallpaper-branding-%{theme_name} +%license LICENSE +%ghost %{_sysconfdir}/alternatives/openSUSE-default.xml +%{_datadir}/wallpapers/openSUSE-default.xml +%dir %{_datadir}/gnome-background-properties/ %{_datadir}/gnome-background-properties/wallpaper-branding-openSUSE.xml %{_datadir}/wallpapers/ # File from dynamic-wallpaper-branding-openSUSE: %exclude %{_datadir}/wallpapers/openSUSE-default-dynamic.xml -# FIXME: It should be owned by a different package: -%dir %{_datadir}/gnome-background-properties/ -%files -n yast2-qt-branding-openSUSE +%files -n yast2-qt-branding-%{theme_name} %dir %{_datadir}/YaST2 %dir %{_datadir}/YaST2/theme %dir %{_datadir}/YaST2/theme/current %{_datadir}/YaST2/theme/current/wizard %files -n icewm-theme-yast-installation -%{_sysconfdir}/icewm -%{_datadir}/icewm +%dir %{_sysconfdir}/icewm/ +%config %{_sysconfdir}/icewm/theme +%dir %{_datadir}/icewm/ +%dir %{_datadir}/icewm/themes/ +%{_datadir}/icewm/themes/yast-installation/ -%files -n libreoffice-branding-openSUSE +%files -n libreoffice-branding-%{theme_name} %dir %{_datadir}/libreoffice %{_datadir}/libreoffice/program -%files -n xfce4-splash-branding-openSUSE -%doc COPYING -%{_datadir}/pixmaps/xfce4-splash-openSUSE.png - -%files -n systemd-icon-branding-openSUSE +%files -n systemd-icon-branding-%{theme_name} %{_datadir}/icons/hicolor -%if 0%{?package_grub2_theme} > 0 -%files -n grub2-branding-openSUSE +%if 0%{?grub2} > 0 +%files -n grub2-branding-%{theme_name} %{_datadir}/grub2 %dir /boot/grub2 %dir /boot/grub2/themes -%ghost /boot/grub2/themes/openSUSE +%ghost /boot/grub2/themes/%{theme_name} +%endif + +%if 0%{?gfxboot} > 0 +%files -n gfxboot-branding-%{theme_name} +%{_sysconfdir}/bootsplash +%config %{_sysconfdir}/bootsplash/themes/openSUSE/bootloader/* +# Intentionally skipping over .tr files as they are hard links +%config %{_sysconfdir}/bootsplash/themes/openSUSE/cdrom/*.{hlp,jpg,mod,dat,txt,tlk,cfg,fnt} +%config %{_sysconfdir}/bootsplash/themes/openSUSE/cdrom/bootlogo +%{_sysconfdir}/bootsplash/themes/openSUSE/cdrom/* +%ghost /boot/message %endif -%files -n plymouth-branding-openSUSE -%{_datadir}/plymouth/themes/openSUSE/ +%files -n plymouth-branding-%{theme_name} +%{_datadir}/plymouth/themes/spinner/watermark.png %changelog
