Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Factory checked in at 2018-03-09 10:35:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "branding-openSUSE" Fri Mar 9 10:35:32 2018 rev:95 rq:583887 version:13.3 Changes: -------- --- /work/SRC/openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes 2018-01-28 00:37:14.675614278 +0100 +++ /work/SRC/openSUSE:Factory/.branding-openSUSE.new/branding-openSUSE.changes 2018-03-09 10:35:36.502419496 +0100 @@ -1,0 +2,25 @@ +Wed Mar 7 13:07:06 UTC 2018 - dims...@opensuse.org + +- Add icewm-theme-yast-installation sub package + +------------------------------------------------------------------- +Wed Mar 7 09:19:57 UTC 2018 - dims...@opensuse.org + +- Drop kde-branding-openSUSE: Only legacy KDE 4 files + * sysconfig.displaymanager-kdm + * kde-branding-openSUSE.spec + * kde-branding-openSUSE.changes + +------------------------------------------------------------------- +Tue Mar 6 10:06:23 UTC 2018 - dims...@opensuse.org + +- Update to git rev 14eaa1a: + + Use new desktop wallpaper. + + Updating plymouth and grub themes, xfce splash to fit new + branding guidelines. + + Add title properties to grub2 theme (boo#1076577). + + Added splash image for XFCE. + + Fixes to xfce splash, new yast theme, gfxboot. +- Sync spec file with Leap; spec-cleaned. + +------------------------------------------------------------------- Old: ---- kde-branding-openSUSE.changes kde-branding-openSUSE.spec pre_checkin.sh sysconfig.displaymanager-kdm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.0i0eiT/_old 2018-03-09 10:35:42.054219609 +0100 +++ /var/tmp/diff_new_pack.0i0eiT/_new 2018-03-09 10:35:42.058219465 +0100 @@ -16,52 +16,50 @@ # -Name: branding-openSUSE -Version: 13.3 -Release: 0 -Provides: branding -Conflicts: otherproviders(branding) -Url: http://github.com/openSUSE/branding -Source0: openSUSE.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%ifarch x86_64 %ix86 +%define theme_name openSUSE +%ifarch x86_64 %{ix86} %define package_gfxboot 1 BuildRequires: gfxboot-devel %endif -%ifarch %arm aarch64 %{ix86} x86_64 ppc ppc64 +%ifarch %{arm} aarch64 %{ix86} x86_64 ppc ppc64 %define package_grub2_theme 1 BuildRequires: grub2 %endif +Name: branding-openSUSE +Version: 13.3 +Release: 0 Summary: openSUSE Brand File -License: BSD-3-Clause +License: BSD-3-Clause AND CC-BY-SA-3.0 AND GPL-2.0-or-later Group: System/Fhs +Url: http://github.com/openSUSE/branding +Source0: openSUSE.tar.xz BuildRequires: fdupes BuildRequires: fribidi +BuildRequires: suse-module-tools BuildRequires: update-desktop-files +Conflicts: branding +Provides: branding +Obsoletes: dynamic-wallpaper-branding-openSUSE <= 13.2 +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 +# FIXME: use proper Requires(pre/post/preun/...) License: BSD-3-Clause Group: System/Boot PreReq: gfxboot >= 4 Supplements: packageand(gfxboot:branding-openSUSE) +Conflicts: gfxboot-branding Provides: gfxboot-branding = %{version} Provides: gfxboot-theme = %{version} -Conflicts: otherproviders(gfxboot-branding) BuildArch: noarch %description -n gfxboot-branding-openSUSE @@ -74,8 +72,8 @@ 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 @@ -85,40 +83,49 @@ Summary: openSUSE branding for yast2-qt License: BSD-3-Clause Group: System/Fhs +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 +%package -n icewm-theme-yast-installation +Summary: Theme configuration for IceWM during the installation +License: BSD-3-Clause AND CC-BY-SA-3.0 AND GPL-2.0-or-later +Group: System/Fhs +Conflicts: icewm-theme-branding + +%description -n icewm-theme-yast-installation +This IceWM theme is specifically tailored to the openSUSE 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 +Conflicts: xfce4-splash-branding Provides: xfce4-splash-branding = %{version} -Conflicts: otherproviders(xfce4-splash-branding) +BuildArch: noarch %description -n xfce4-splash-branding-openSUSE openSUSE %{version} branding for the XFCE splash %if 0%{?package_grub2_theme} > 0 - %package -n grub2-branding-openSUSE Summary: openSUSE branding for GRUB2's graphical console -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. +License: CC-BY-SA-3.0 +Group: System/Fhs Requires: grub2 -Provides: grub2-branding = %{version} Supplements: packageand(grub2:branding-openSUSE) -Conflicts: otherproviders(grub2-branding) +Conflicts: grub2-branding +Provides: grub2-branding = %{version} 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 @@ -127,13 +134,17 @@ %package -n plymouth-branding-openSUSE Summary: openSUSE branding for Plymouth bootsplash -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Fhs +BuildRequires: plymouth-plugin-two-step +Requires: plymouth-plugin-two-step +# FIXME: use proper Requires(pre/post/preun/...) PreReq: plymouth-plugin-script PreReq: plymouth-scripts +Requires(%post): plymouth-plugin-two-step Supplements: packageand(plymouth:branding-openSUSE) +Conflicts: plymouth-branding Provides: plymouth-branding = %{version} -Conflicts: otherproviders(plymouth-branding) BuildArch: noarch %description -n plymouth-branding-openSUSE @@ -151,26 +162,17 @@ %if 0%{?package_gfxboot} > 0 mkdir gfx -cp -a /usr/share/gfxboot/themes/openSUSE/ gfx +cp -a %{_datadir}/gfxboot/themes/openSUSE/ gfx list=`cd openSUSE/gfxboot && find -type f` for i in $list; do cp openSUSE/gfxboot/$i gfx/openSUSE/$i done pushd gfx/openSUSE -%if 0%{?sle_version} -# If a sle_version is defined, then this must be Leap -MAJOR=$((%{sle_version} / 10000)) -MINOR=$(($((%{sle_version} % 10000)) / 100)) -PRODUCT="openSUSE Leap ${MAJOR}.${MINOR}" -%else -# otherwise it must be Tumbleweed -PRODUCT="openSUSE Tumbleweed" -%endif -sed -i -e "s,product=.*,product=${PRODUCT}," config +sed -i -e "s,product=.*,product=openSUSE Leap %{version}," config perl -pi -e 's/^(welcome=).*/${1}3/' src/gfxboot.cfg -export PATH=/usr/sbin:$PATH -make +export PATH=%{_prefix}/sbin:$PATH +make %{?_smp_mflags} popd %endif @@ -182,11 +184,11 @@ # gfxboot should use a link /etc/bootsplash/theme -> /usr/share/bootsplash # like splashy if test -f gfx/openSUSE/bootlogo; then - install -d -m 755 %{buildroot}/etc/bootsplash/themes/openSUSE/{bootloader,cdrom} - cp gfx/openSUSE/bootlogo %{buildroot}/etc/bootsplash/themes/openSUSE/cdrom - /usr/share/gfxboot/bin/unpack_bootlogo %{buildroot}/etc/bootsplash/themes/openSUSE/cdrom - install -m 644 gfx/openSUSE/{message,po/*.tr,help-boot/*.hlp} %{buildroot}/etc/bootsplash/themes/openSUSE/bootloader - /usr/share/gfxboot/bin/2hl --link --quiet %{buildroot}/etc/bootsplash/themes/openSUSE/* + install -d -m 755 %{buildroot}%{_sysconfdir}/bootsplash/themes/openSUSE/{bootloader,cdrom} + cp gfx/openSUSE/bootlogo %{buildroot}%{_sysconfdir}/bootsplash/themes/openSUSE/cdrom + %{_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 @@ -195,18 +197,19 @@ rm -rf %{buildroot}%{_datadir}/kde4/apps rm -rf %{buildroot}%{_datadir}/gimp -for i in %{buildroot}/usr/share/wallpapers/*.desktop; do +for i in %{buildroot}%{_datadir}/wallpapers/*.desktop; do %suse_update_desktop_file "$i" done -%suse_update_desktop_file %{buildroot}/usr/share/wallpapers/openSUSEdefault/metadata.desktop +%suse_update_desktop_file %{buildroot}%{_datadir}/wallpapers/openSUSEdefault/metadata.desktop # Touch the file handled with update-alternatives -touch %{buildroot}/usr/share/wallpapers/openSUSE-default.xml +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +ln -s -f %{_sysconfdir}/alternatives/openSUSE-default.xml %{buildroot}%{_datadir}/wallpapers/openSUSE-default.xml # try how far we get without them -rm -v %{buildroot}/usr/share/wallpapers/openSUSE*desktop %{buildroot}/usr/share/wallpapers/openSUSE*jpg %{buildroot}/usr/share/wallpapers/default* -%fdupes %{buildroot}/usr/share/backgrounds +rm -v %{buildroot}%{_datadir}/wallpapers/openSUSE*desktop %{buildroot}%{_datadir}/wallpapers/openSUSE*jpg %{buildroot}%{_datadir}/wallpapers/default* +%fdupes %{buildroot}%{_datadir}/backgrounds -ln -sf /usr/share/wallpapers/openSUSE-default-static.xml %{buildroot}/usr/share/wallpapers/openSUSE-default-dynamic.xml +ln -sf %{_datadir}/wallpapers/openSUSE-default-static.xml %{buildroot}%{_datadir}/wallpapers/openSUSE-default-dynamic.xml # remove %if 0%{?package_grub2_theme} < 1 @@ -214,31 +217,30 @@ %endif %check -make -C openSUSE check DESTDIR=%{buildroot} +make %{?_smp_mflags} -C openSUSE check DESTDIR=%{buildroot} %if 0%{?package_gfxboot} > 0 - %post -n gfxboot-branding-openSUSE gfxboot --update-theme openSUSE %endif %post -n wallpaper-branding-openSUSE -update-alternatives --install /usr/share/wallpapers/openSUSE-default.xml openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-static.xml 5 +update-alternatives --install %{_datadir}/wallpapers/openSUSE-default.xml openSUSE-default.xml %{_datadir}/wallpapers/openSUSE-default-static.xml 5 %postun -n wallpaper-branding-openSUSE # Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed -if [ ! -f /usr/share/wallpapers/openSUSE-default-static.xml ]; then - update-alternatives --remove openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-static.xml +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 +%{_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 - /usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg || true + %{_sbindir}/grub2-mkconfig -o /boot/grub2/grub.cfg || true fi %endif @@ -247,7 +249,7 @@ %postun -n grub2-branding-openSUSE if [ $1 = 0 ] ; then - rm -rf /boot/grub2/themes/%theme_name + rm -rf /boot/grub2/themes/%{theme_name} fi %endif @@ -276,54 +278,52 @@ %{?regenerate_initrd_posttrans} %files -%defattr(-,root,root) -%doc COPYING +%license COPYING + %{_sysconfdir}/SUSE-brand %if 0%{?package_gfxboot} > 0 - %files -n gfxboot-branding-openSUSE -%defattr(-,root,root) %{_sysconfdir}/bootsplash %ghost /boot/message %endif %files -n wallpaper-branding-openSUSE -%defattr(-,root,root) -%doc COPYING -%ghost /usr/share/wallpapers/openSUSE-default.xml -/usr/share/gnome-background-properties/wallpaper-branding-openSUSE.xml -/usr/share/wallpapers/ +%license COPYING + +%ghost %{_sysconfdir}/alternatives/openSUSE-default.xml +%{_datadir}/wallpapers/openSUSE-default.xml +%{_datadir}/gnome-background-properties/wallpaper-branding-openSUSE.xml +%{_datadir}/wallpapers/ # File from dynamic-wallpaper-branding-openSUSE: -%exclude /usr/share/wallpapers/openSUSE-default-dynamic.xml +%exclude %{_datadir}/wallpapers/openSUSE-default-dynamic.xml # FIXME: It should be owned by a different package: -%dir /usr/share/gnome-background-properties/ +%dir %{_datadir}/gnome-background-properties/ %files -n yast2-qt-branding-openSUSE -%defattr(-,root,root) -%dir /usr/share/YaST2 -%dir /usr/share/YaST2/theme -%dir /usr/share/YaST2/theme/current -/usr/share/YaST2/theme/current/wizard +%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 %files -n xfce4-splash-branding-openSUSE -%defattr(-,root,root) -%doc openSUSE/xfce/COPYING -/usr/share/pixmaps/xfce4-splash-openSUSE.png +%license COPYING + +%{_datadir}/pixmaps/xfce4-splash-openSUSE.png %if 0%{?package_grub2_theme} > 0 %files -n grub2-branding-openSUSE -%defattr(-,root,root) %{_datadir}/grub2 %dir /boot/grub2 -%dir /boot/grub2/backgrounds %dir /boot/grub2/themes -%ghost /boot/grub2/backgrounds/openSUSE %ghost /boot/grub2/themes/openSUSE %endif %files -n plymouth-branding-openSUSE -%defattr(-, root, root) %{_datadir}/plymouth/themes/openSUSE/ %changelog ++++++ openSUSE.tar.xz ++++++ /work/SRC/openSUSE:Factory/branding-openSUSE/openSUSE.tar.xz /work/SRC/openSUSE:Factory/.branding-openSUSE.new/openSUSE.tar.xz differ: char 26, line 1
