Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit branding-openSUSE for openSUSE:Factory
Hello community,

here is the log from the commit of package branding-openSUSE for
openSUSE:Factory checked in at 2019-04-09 20:16:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/branding-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.branding-openSUSE.new.3908 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "branding-openSUSE"

Tue Apr 9 20:16:26 2019 rev:106 rq:691693 version:84.87.20180403

Changes:
--------
--- /work/SRC/openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes
2019-03-18 10:33:28.855558732 +0100
+++
/work/SRC/openSUSE:Factory/.branding-openSUSE.new.3908/branding-openSUSE.changes
2019-04-09 20:16:27.113559450 +0200
@@ -1,0 +2,6 @@
+Wed Apr 3 01:12:38 UTC 2019 - Stasiek Michalski <hellcp@xxxxxxxxxxx>
+
+- Rewrite the spec and makefile to make it easier to contibute
+- Change the default plymouth theme to bgrt
+
+-------------------------------------------------------------------

Old:
----
openSUSE.tar.xz

New:
----
branding-tumbleweed.zip

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.ugFSyk/_old 2019-04-09 20:16:29.249564608 +0200
+++ /var/tmp/diff_new_pack.ugFSyk/_new 2019-04-09 20:16:29.249564608 +0200
@@ -2,6 +2,7 @@
# spec file for package branding-openSUSE
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 Stasiek Michalski <hellcp@xxxxxxxxxxxx>.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -11,35 +12,41 @@
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-
+#
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#

-
%define theme_name openSUSE
+%define theme_version tumbleweed
+%define theme_version_clean Tumbleweed
+%define date 20180403
+
%ifarch x86_64 %{ix86}
-%define package_gfxboot 1
-BuildRequires: gfxboot-devel
+%define gfxboot 1
%endif
+
%ifarch %{arm} aarch64 %{ix86} x86_64 ppc ppc64
-%define package_grub2_theme 1
-BuildRequires: grub2
+%define grub2 1
%endif
-Name: branding-openSUSE
-Version: 15.0
+
+Name: branding-%{theme_name}
+Version: 84.87.%{date}
Release: 0
-Summary: openSUSE Brand File
+Summary: %{theme_name} %{theme_version_clean} Brand File
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
+URL: https://github.com/openSUSE/branding
+Source0: branding-%{theme_version}.zip
BuildRequires: fdupes
BuildRequires: fribidi
BuildRequires: suse-module-tools
BuildRequires: update-desktop-files
+BuildRequires: rsvg-view
+BuildRequires: GraphicsMagick
+BuildRequires: unzip
+BuildRequires: optipng
Conflicts: branding
Provides: branding
-Obsoletes: dynamic-wallpaper-branding-openSUSE <= 13.2
BuildArch: noarch
%if 0%{?suse_version} > 1320
BuildRequires: update-bootloader-rpm-macros
@@ -49,25 +56,8 @@
This package contains the file %{_sysconfdir}/SUSE-brand, and its name is used
as
a trigger for installation of correct vendor brand packages.

-%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}
-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
@@ -76,74 +66,80 @@
Provides: wallpaper-branding = %{version}
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: google-opensans-fonts
+Supplements: (libyui-qt and branding-%{theme_name})
Conflicts: yast2-qt-branding
Provides: yast2-qt-branding = %{version}
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
+Supplements: ((yast-installation and icewm) and branding-%{theme_name})
Group: System/Fhs
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
+%package -n xfce4-splash-branding-%{theme_name}
+Summary: %{theme_name} %{theme_version_clean} branding for XFCE
splash
License: CC-BY-SA-3.0
Group: System/Fhs
+Supplements: (xfce4-session and branding-%{theme_name})
Conflicts: xfce4-splash-branding
Provides: xfce4-splash-branding = %{version}
BuildArch: noarch

-%description -n xfce4-splash-branding-openSUSE
-openSUSE %{version} branding for the XFCE splash
+%description -n xfce4-splash-branding-%{theme_name}
+%{theme_name} %{theme_version_clean} 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
+Supplements: (systemd and branding-%{theme_name})
+Provides: systemd-icon-branding = %{version}
Group: System/Fhs
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
-# 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.
+%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
Requires: grub2
-Supplements: packageand(grub2:branding-openSUSE)
+BuildRequires: grub2
+Supplements: (grub2 and branding-%{theme_name})
Conflicts: grub2-branding
Provides: grub2-branding = %{version}
BuildArch: noarch
@@ -151,40 +147,54 @@
%{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
+Group: System/Boot
+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
+%package -n plymouth-branding-%{theme_name}
+Summary: %{theme_name} %{theme_version_clean} branding for Plymouth
bootsplash
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
+BuildRequires: plymouth-theme-bgrt
+Requires: plymouth-theme-bgrt
+PreReq: plymouth-theme-bgrt
PreReq: plymouth-scripts
-Requires(%post): plymouth-plugin-two-step
-Supplements: packageand(plymouth:branding-openSUSE)
+Requires(post): plymouth-scripts
+Requires(postun): plymouth-scripts
+Requires(post): plymouth-theme-bgrt
+Supplements: (plymouth and branding-%{theme_name})
Conflicts: plymouth-branding
Provides: plymouth-branding = %{version}
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
+%setup -qn 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`
@@ -193,20 +203,19 @@
done
pushd gfx/openSUSE
%if 0%{?sle_version}
- sed -i -e "s,product=.*,product=openSUSE Leap %{version}," config
+ sed -i -e "s,product=.*,product=%{theme_name} %{theme_version_clean}," config
%else
- sed -i -e "s,product=.*,product=openSUSE Tumbleweed," config
+ 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=%{_prefix}/sbin:$PATH
-make %{?_smp_mflags}
+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
@@ -217,52 +226,33 @@
%{_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}
-rm -rf %{buildroot}%{_datadir}/kde4/apps
-rm -rf %{buildroot}%{_datadir}/gimp
-
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
-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}%{_datadir}/wallpapers/openSUSE*desktop
%{buildroot}%{_datadir}/wallpapers/openSUSE*jpg
%{buildroot}%{_datadir}/wallpapers/default*
-%fdupes %{buildroot}%{_datadir}/backgrounds
+%fdupes -s %{buildroot}%{_datadir}/wallpapers/
+%fdupes -s %{buildroot}%{_datadir}/YaST2/theme/current/wizard/

-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 %{?_smp_mflags} -C openSUSE check DESTDIR=%{buildroot}
+%suse_update_desktop_file
%{buildroot}%{_datadir}/wallpapers/openSUSEdefault/metadata.desktop

-%if 0%{?package_gfxboot} > 0
-%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
+%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}
@@ -272,93 +262,100 @@
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}
fi
%endif

-%post -n plymouth-branding-openSUSE
-export LIB=%{_libdir}
+%if 0%{?gfxboot} > 0
+%post -n gfxboot-branding-%{theme_name}
+gfxboot --update-theme %{theme_name}
+%endif
+
+%post -n plymouth-branding-%{theme_name}
OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
-if [ "$OTHEME" == "text" -o "$OTHEME" == "openSUSE" -o "$OTHEME" ==
"basedonopensuse" ]; then
+if [ "$OTHEME" == "text" -o "$OTHEME" == "bgrt" ]; then
if [ ! -e /.buildenv ]; then
- %{_sbindir}/plymouth-set-default-theme openSUSE
+ %{_sbindir}/plymouth-set-default-theme bgrt
%{?regenerate_initrd_post}
else
- %{_sbindir}/plymouth-set-default-theme openSUSE
+ %{_sbindir}/plymouth-set-default-theme bgrt
fi
fi

-%postun -n plymouth-branding-openSUSE
+%postun -n plymouth-branding-%{theme_name}
if [ $1 -eq 0 ]; then
- export LIB=%{_libdir}
- if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" ]; then
+ if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "bgrt" ]; then
%{_sbindir}/plymouth-set-default-theme --reset
%{?regenerate_initrd_post}
fi
fi

-%posttrans -n plymouth-branding-openSUSE
+%posttrans -n plymouth-branding-%{theme_name}
%{?regenerate_initrd_posttrans}

%files
-%license COPYING
-
-%{_sysconfdir}/SUSE-brand
-
-%if 0%{?package_gfxboot} > 0
-%files -n gfxboot-branding-openSUSE
-%{_sysconfdir}/bootsplash
-%ghost /boot/message
-%endif
-
-%files -n wallpaper-branding-openSUSE
-%license COPYING
+%license LICENSE
+%config %{_sysconfdir}/SUSE-brand

+%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
-%license COPYING
-
+%files -n xfce4-splash-branding-%{theme_name}
+%license LICENSE
%{_datadir}/pixmaps/xfce4-splash-openSUSE.png

-%files -n systemd-icon-branding-openSUSE
-/usr/share/icons/hicolor
+%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


< Previous Next >
This Thread
  • No further messages