Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Factory checked in at 2015-12-29 12:58:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "branding-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes 2015-02-24 13:07:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.branding-openSUSE.new/branding-openSUSE.changes 2015-12-29 12:58:45.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 16 08:52:54 UTC 2015 - [email protected] + +- Update branding for Tumbleweed with new graphics. +- Reuse .spec file from Leap branding package. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/branding-openSUSE/kde-branding-openSUSE.changes 2014-11-19 20:27:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.branding-openSUSE.new/kde-branding-openSUSE.changes 2015-12-29 12:58:45.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Dec 16 08:52:54 UTC 2015 - [email protected] + +- Update branding for Tumbleweed with new graphics. +- Reuse .spec file from Leap branding package. + +------------------------------------------------------------------- +Tue Feb 17 15:22:36 UTC 2015 - [email protected] + +- enable grub theme on aarch64 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.3L4lsS/_old 2015-12-29 12:58:48.000000000 +0100 +++ /var/tmp/diff_new_pack.3L4lsS/_new 2015-12-29 12:58:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: branding-openSUSE -Version: 13.2 +Version: 13.3 Release: 0 Provides: branding Conflicts: otherproviders(branding) @@ -28,7 +28,7 @@ %define package_gfxboot 1 BuildRequires: gfxboot-devel %endif -%ifarch %{ix86} x86_64 ppc ppc64 aarch64 +%ifarch aarch64 %{ix86} x86_64 ppc ppc64 %define package_grub2_theme 1 BuildRequires: grub2 %endif @@ -39,6 +39,7 @@ BuildRequires: fribidi BuildRequires: update-desktop-files BuildArch: noarch +Obsoletes: dynamic-wallpaper-branding-openSUSE <= 13.2 %description This package contains the file /etc/SUSE-brand, and its name is used as @@ -76,29 +77,6 @@ %description -n wallpaper-branding-openSUSE openSUSE %{version} defaults wallpapers -%package -n dynamic-wallpaper-branding-openSUSE -Summary: Dynamic wallpaper for GNOME, with openSUSE look -License: BSD-3-Clause -Group: System/GUI/GNOME -Requires(post): update-alternatives -Requires(postun): update-alternatives -Supplements: packageand(wallpaper-branding-openSUSE:gnome-settings-daemon) -Provides: dynamic-wallpaper-branding = %{version} -Conflicts: otherproviders(dynamic-wallpaper-branding) -# Used to live in gconf2-branding-openSUSE, with a different name, up to version 11.4 (included) -Provides: openSUSE-dynamic-wallpaper = %{version} -Obsoletes: openSUSE-dynamic-wallpaper <= %{version} -# Old name, until openSUSE 11.3 (included) -Provides: desktop-data-openSUSE-extra-gnome = %{version} -Obsoletes: desktop-data-openSUSE-extra-gnome < %{version} -BuildArch: noarch - -%description -n dynamic-wallpaper-branding-openSUSE -This package contains a dynamic wallpaper with openSUSE look. - -A dynamic wallpaper changes depending on the time of the day: it is -generally bright during the day, and dark during the night. - %package -n yast2-qt-branding-openSUSE Summary: openSUSE branding for yast2-qt License: BSD-3-Clause @@ -171,7 +149,8 @@ cp openSUSE/gfxboot/$i gfx/openSUSE/$i done pushd gfx/openSUSE -sed -i -e "s,product=.*,product=openSUSE %{version}," 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 @@ -210,6 +189,8 @@ rm -v %{buildroot}/usr/share/wallpapers/openSUSE*desktop %{buildroot}/usr/share/wallpapers/openSUSE*jpg %{buildroot}/usr/share/wallpapers/default* %fdupes %{buildroot}/usr/share/backgrounds +ln -sf /usr/share/wallpapers/openSUSE-default-static.xml %{buildroot}/usr/share/wallpapers/openSUSE-default-dynamic.xml + # remove %if 0%{?package_grub2_theme} < 1 rm -rf %{buildroot}/%{_datadir}/grub2 @@ -233,15 +214,6 @@ update-alternatives --remove openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-static.xml fi -%post -n dynamic-wallpaper-branding-openSUSE -update-alternatives --install /usr/share/wallpapers/openSUSE-default.xml openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-dynamic.xml 10 - -%postun -n dynamic-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-dynamic.xml ]; then - update-alternatives --remove openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-dynamic.xml -fi - %if 0%{?package_grub2_theme} > 0 %post -n grub2-branding-openSUSE %{_datadir}/grub2/themes/%theme_name/activate-theme @@ -258,7 +230,7 @@ %post -n plymouth-branding-openSUSE export LIB=%{_libdir} OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" -if [ "$OTHEME" = "text" -o "$OTHEME" = "openSUSE" -o "$OTHEME" = "basedonopensuse" ]; then +if [ "$OTHEME" == "text" -o "$OTHEME" == "openSUSE" -o "$OTHEME" == "basedonopensuse" ]; then if [ ! -e /.buildenv ]; then %{_sbindir}/plymouth-set-default-theme -R openSUSE else @@ -269,7 +241,7 @@ %postun -n plymouth-branding-openSUSE if [ $1 -eq 0 ]; then export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "openSUSE" ]; then + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" ]; then %{_sbindir}/plymouth-set-default-theme -R --reset fi fi @@ -298,25 +270,6 @@ # FIXME: It should be owned by a different package: %dir /usr/share/gnome-background-properties/ -%files -n dynamic-wallpaper-branding-openSUSE -%defattr(-,root,root) -%doc COPYING -## WARNING WARNING WARNING -# If we ever remove the dynamic background, then the -# openSUSE-default-dynamic.xml file should still be shipped, as a symlink to -# openSUSE-default-static.xml. Else, we break the wallpaper configuration for -# some users. -## WARNING WARNING WARNING -# Ugly wildcard, but this way we don't have to update anything on name change -%{_datadir}/backgrounds/*/ -%{_datadir}/gnome-background-properties/dynamic-wallpaper-branding-openSUSE.xml -%dir %{_datadir}/wallpapers -%ghost %{_datadir}/wallpapers/openSUSE-default.xml -%{_datadir}/wallpapers/openSUSE-default-dynamic.xml -# FIXME: Should be owned by a different package: -%dir %{_datadir}/backgrounds -%dir %{_datadir}/gnome-background-properties - %files -n yast2-qt-branding-openSUSE %defattr(-,root,root) %dir /usr/share/YaST2 ++++++ 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
