Hello community,
here is the log from the commit of package branding-openSUSE for
openSUSE:Factory checked in at 2018-03-10 12:03:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/branding-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.branding-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "branding-openSUSE"
Sat Mar 10 12:03:16 2018 rev:96 rq: version:13.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes
2018-03-09 10:35:36.502419496 +0100
+++ /work/SRC/openSUSE:Factory/.branding-openSUSE.new/branding-openSUSE.changes
2018-03-10 12:03:19.576386408 +0100
@@ -2,25 +1,0 @@
-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.
-
--------------------------------------------------------------------
New Changes file:
--- /dev/null 2018-03-01 08:56:54.644963210 +0100
+++
/work/SRC/openSUSE:Factory/.branding-openSUSE.new/kde-branding-openSUSE.changes
2018-03-10 12:03:20.896338841 +0100
@@ -0,0 +1,734 @@
+-------------------------------------------------------------------
+Wed Jan 24 09:26:38 UTC 2018 - dims...@opensuse.org
+
+- Fixup product version for Leap based on sle_version, and for
+ Tumbleweed set it to 'openSUSE Tumbleweed'.
+
+-------------------------------------------------------------------
+Wed Nov 8 07:05:39 UTC 2017 - mch...@suse.com
+
+- Use %posttrans for initrd creation (bsc#1066666)
+
+-------------------------------------------------------------------
+Fri Jan 20 09:35:32 UTC 2017 - dleuenber...@suse.com
+
+- Also require grub2 when using the new update-bootloader-rpm-macros:
+ Otherwise the installer might install the branding package before
+ grub2, resulting in /etc/default/grub to not exist and the theme
+ failing to activate.
+
+-------------------------------------------------------------------
+Fri Jan 13 09:09:49 UTC 2017 - mch...@suse.com
+
+- Support %posttrans with macros provided by update-bootloader-rpm-macros
+ package (bsc#997317)
+
+-------------------------------------------------------------------
+Thu Nov 24 09:06:11 UTC 2016 - dmuel...@suse.com
+
+- enable grub2-branding-openSUSE also for %%arm
+
+-------------------------------------------------------------------
+Wed Oct 19 18:47:58 UTC 2016 - fv...@suse.com
+
+- Change version back to 13.3
+
+-------------------------------------------------------------------
+Tue Oct 18 07:53:19 UTC 2016 - co...@suse.com
+
+- Update from git to get yast theme updates (pr#60)
+
+-------------------------------------------------------------------
+Mon Jun 6 12:45:20 UTC 2016 - fv...@suse.com
+
+- Add yast2-qt-branding-openSUSE back and remove Supplements
+ - Much less breakage
+
+-------------------------------------------------------------------
+Mon May 30 06:52:11 UTC 2016 - fv...@suse.com
+
+- Drop yast2-qt-branding-openSUSE (boo#955381)
+- Fix xfce4-splash-branding-openSUSE conflicts
+
+-------------------------------------------------------------------
+Fri Feb 19 10:05:49 UTC 2016 - dims...@opensuse.org
+
+- grub2 theme: use blueish color for timeout bar.
+
+-------------------------------------------------------------------
+Tue Feb 16 13:21:17 UTC 2016 - dims...@opensuse.org
+
+- Update branding with final touches.
+- plymouth script: revert to single sized backround image. The
+ one in the current branding deck fades out to black.
+
+-------------------------------------------------------------------
+Mon Jan 4 13:17:31 UTC 2016 - dims...@opensuse.org
+
+- Update plymouth script: loading different backgrounds based on
+ screen aspect ratio.
+
+-------------------------------------------------------------------
+Wed Dec 16 08:52:54 UTC 2015 - dims...@opensuse.org
+
+- Update branding for Tumbleweed with new graphics.
+- Reuse .spec file from Leap branding package.
+
+-------------------------------------------------------------------
+Tue Feb 17 15:22:36 UTC 2015 - lnus...@suse.de
+
+- enable grub theme on aarch64
+
+-------------------------------------------------------------------
+Thu Nov 13 08:49:11 UTC 2014 - tittiatc...@gmail.com
+
+- Update the tarball to fix the kde-branding patches for KDE 4.14.3
+
+-------------------------------------------------------------------
+Sat Nov 08 06:12:00 UTC 2014 - Led <led...@gmail.com>
+
+- fix bashisms in post/postun script
+
+-------------------------------------------------------------------
+Sat Oct 25 13:07:55 UTC 2014 - rbrown...@opensuse.org
+
+- Fix plymouth theme
+- Replace Grub2 and gfxboot themes with mint on black instead of
+ white on mint
+
+-------------------------------------------------------------------
+Mon Oct 13 21:03:04 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update KSplash for 13.2 branding
+
+-------------------------------------------------------------------
+Sat Oct 11 11:32:41 UTC 2014 - matwey.korni...@gmail.com
+
+- plymouth-plugin-label is not required anymore:
+ +
https://github.com/openSUSE/branding/commit/e02d63e4ef11b7d9ec2e9a22326bfb83c1aba310
+ + http://lists.opensuse.org/opensuse-arm/2014-10/msg00032.html
+
+-------------------------------------------------------------------
+Mon Sep 8 06:12:40 UTC 2014 - co...@suse.com
+
+update go git:
+- updated KDM theme for 13.2
+- reduced svg file size with Inkscape > Vacuum Defs
+
+-------------------------------------------------------------------
+Tue Sep 2 06:47:39 UTC 2014 - co...@suse.com
+
+- fix merge conflicts
+
+-------------------------------------------------------------------
+Mon Sep 01 13:33:11 UTC 2014 - rbrown...@opensuse.org
+
+- Lower openSUSE logo in grub2 by 5px to improve spacing under OS title
+
+-------------------------------------------------------------------
+Mon Sep 01 13:26:22 UTC 2014 - rbrown...@opensuse.org
+
+- replace grub2 openSUSE logo with high resolution badge
+
+-------------------------------------------------------------------
+Mon Sep 01 12:58:55 UTC 2014 - rbrown...@opensuse.org
+
+- add openSUSE logo to gfxboot images
+
+-------------------------------------------------------------------
+Mon Sep 01 08:47:14 UTC 2014 - rbrown...@opensuse.org
+
+- new yast branding location now handled by git makefile, remove mv
+ from spec file
+
+-------------------------------------------------------------------
+Sun Aug 31 18:47:11 UTC 2014 - rbrown...@opensuse.org
+
+- Initial openSUSE 13.2 branding
+
+-------------------------------------------------------------------
+Sat Aug 30 15:04:07 UTC 2014 - co...@suse.com
+
+- yast branding needs to be installed in /usr/share/YaST2/theme/current
+ now
+
+-------------------------------------------------------------------
+Fri Apr 25 15:51:12 UTC 2014 - rbrown...@opensuse.org
+
+- Update YaST installer look to similar to sle12
+
+-------------------------------------------------------------------
+Thu Feb 27 07:35:43 UTC 2014 - co...@suse.com
+
+- set version to 13.2 - let the games begin
+
+-------------------------------------------------------------------
+Mon Oct 7 17:11:09 UTC 2013 - br...@ioda-net.ch
+
+- Update for kdm : readd traditionnal username field
+ fix bnc#844247 for nis login
+ fix bnc#841719 clickable list again
+
+-------------------------------------------------------------------
+Tue Oct 1 18:23:34 UTC 2013 - br...@ioda-net.ch
+
+- Move tarball compression to xz and save 20% of space
+- github 13.1 Makefile adapted to new tar.xz
+
+-------------------------------------------------------------------
+Mon Sep 30 14:50:48 UTC 2013 - br...@ioda-net.ch
+
+- New tarball with fixes for userlist in kdm
+
https://github.com/Caig/branding/commit/c0e079b539b615ae393c912ba6e6c40116926291
+ bnc#842140
+
+-------------------------------------------------------------------
+Fri Sep 27 08:32:36 UTC 2013 - co...@suse.com
+
+- remove workaround for bnc#782703
+
+-------------------------------------------------------------------
+Tue Sep 10 21:14:55 UTC 2013 - tittiatc...@gmail.com
+
+- Add Requires(post): kdm for the kdm-branding to make sure that
+ the configuration file kdmrc is installed before the branding
+ is installed. This due to possible sequencing errors that could
+ end up with the wrong theme for kdm.
+
++++ 537 more lines (skipped)
++++ between /dev/null
++++ and
/work/SRC/openSUSE:Factory/.branding-openSUSE.new/kde-branding-openSUSE.changes
New:
----
kde-branding-openSUSE.changes
kde-branding-openSUSE.spec
pre_checkin.sh
sysconfig.displaymanager-kdm
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.ZnU3Lf/_old 2018-03-10 12:03:24.204219635 +0100
+++ /var/tmp/diff_new_pack.ZnU3Lf/_new 2018-03-10 12:03:24.208219491 +0100
@@ -16,50 +16,52 @@
#
-%define theme_name openSUSE
-%ifarch x86_64 %{ix86}
+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 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 AND CC-BY-SA-3.0 AND GPL-2.0-or-later
+License: BSD-3-Clause
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 %{_sysconfdir}/SUSE-brand, and its name is used
as
+This package contains the file /etc/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
@@ -72,8 +74,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
@@ -83,49 +85,40 @@
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
-Conflicts: xfce4-splash-branding
-Provides: xfce4-splash-branding = %{version}
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
%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.
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
-Supplements: packageand(grub2:branding-openSUSE)
-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
@@ -134,17 +127,13 @@
%package -n plymouth-branding-openSUSE
Summary: openSUSE branding for Plymouth bootsplash
-License: GPL-2.0-or-later
+License: GPL-2.0+
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
@@ -162,17 +151,26 @@
%if 0%{?package_gfxboot} > 0
mkdir gfx
-cp -a %{_datadir}/gfxboot/themes/openSUSE/ gfx
+cp -a /usr/share/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
-sed -i -e "s,product=.*,product=openSUSE Leap %{version}," config
+%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
perl -pi -e 's/^(welcome=).*/${1}3/' src/gfxboot.cfg
-export PATH=%{_prefix}/sbin:$PATH
-make %{?_smp_mflags}
+export PATH=/usr/sbin:$PATH
+make
popd
%endif
@@ -184,11 +182,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}%{_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/*
+ 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/*
mkdir %{buildroot}/boot
touch %{buildroot}/boot/message
fi
@@ -197,19 +195,18 @@
rm -rf %{buildroot}%{_datadir}/kde4/apps
rm -rf %{buildroot}%{_datadir}/gimp
-for i in %{buildroot}%{_datadir}/wallpapers/*.desktop; do
+for i in %{buildroot}/usr/share/wallpapers/*.desktop; do
%suse_update_desktop_file "$i"
done
-%suse_update_desktop_file
%{buildroot}%{_datadir}/wallpapers/openSUSEdefault/metadata.desktop
+%suse_update_desktop_file
%{buildroot}/usr/share/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
+touch %{buildroot}/usr/share/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
+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 %{_datadir}/wallpapers/openSUSE-default-static.xml
%{buildroot}%{_datadir}/wallpapers/openSUSE-default-dynamic.xml
+ln -sf /usr/share/wallpapers/openSUSE-default-static.xml
%{buildroot}/usr/share/wallpapers/openSUSE-default-dynamic.xml
# remove
%if 0%{?package_grub2_theme} < 1
@@ -217,30 +214,31 @@
%endif
%check
-make %{?_smp_mflags} -C openSUSE check DESTDIR=%{buildroot}
+make -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 %{_datadir}/wallpapers/openSUSE-default.xml
openSUSE-default.xml %{_datadir}/wallpapers/openSUSE-default-static.xml 5
+update-alternatives --install /usr/share/wallpapers/openSUSE-default.xml
openSUSE-default.xml /usr/share/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 %{_datadir}/wallpapers/openSUSE-default-static.xml ]; then
- update-alternatives --remove openSUSE-default.xml
%{_datadir}/wallpapers/openSUSE-default-static.xml
+if [ ! -f /usr/share/wallpapers/openSUSE-default-static.xml ]; then
+ update-alternatives --remove openSUSE-default.xml
/usr/share/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
- %{_sbindir}/grub2-mkconfig -o /boot/grub2/grub.cfg || true
+ /usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg || true
fi
%endif
@@ -249,7 +247,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
@@ -278,52 +276,54 @@
%{?regenerate_initrd_posttrans}
%files
-%license COPYING
-
+%defattr(-,root,root)
+%doc 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
-%license COPYING
-
-%ghost %{_sysconfdir}/alternatives/openSUSE-default.xml
-%{_datadir}/wallpapers/openSUSE-default.xml
-%{_datadir}/gnome-background-properties/wallpaper-branding-openSUSE.xml
-%{_datadir}/wallpapers/
+%defattr(-,root,root)
+%doc COPYING
+%ghost /usr/share/wallpapers/openSUSE-default.xml
+/usr/share/gnome-background-properties/wallpaper-branding-openSUSE.xml
+/usr/share/wallpapers/
# File from dynamic-wallpaper-branding-openSUSE:
-%exclude %{_datadir}/wallpapers/openSUSE-default-dynamic.xml
+%exclude /usr/share/wallpapers/openSUSE-default-dynamic.xml
# FIXME: It should be owned by a different package:
-%dir %{_datadir}/gnome-background-properties/
+%dir /usr/share/gnome-background-properties/
%files -n yast2-qt-branding-openSUSE
-%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
+%defattr(-,root,root)
+%dir /usr/share/YaST2
+%dir /usr/share/YaST2/theme
+%dir /usr/share/YaST2/theme/current
+/usr/share/YaST2/theme/current/wizard
%files -n xfce4-splash-branding-openSUSE
-%license COPYING
-
-%{_datadir}/pixmaps/xfce4-splash-openSUSE.png
+%defattr(-,root,root)
+%doc openSUSE/xfce/COPYING
+/usr/share/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
++++++ kde-branding-openSUSE.spec ++++++
#
# spec file for package kde-branding-openSUSE
#
# Copyright (c) 2018 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# 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 http://bugs.opensuse.org/
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
Name: kde-branding-openSUSE
Version: 13.2
Release: 0
Url: http://github.com/openSUSE/branding
Source0: openSUSE.tar.xz
Source21: sysconfig.displaymanager-kdm
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: openSUSE Brand File
License: BSD-3-Clause
Group: System/Fhs
BuildRequires: fribidi
BuildRequires: kde4-filesystem
BuildRequires: kdelibs4-branding-upstream
BuildRequires: update-desktop-files
BuildRequires: wallpaper-branding-openSUSE
BuildArch: noarch
%description
This package contains the file /etc/SUSE-brand, and its name is used as
a trigger for installation of correct vendor brand packages.
%define theme_name openSUSE
%package -n kdelibs4-branding-openSUSE
Summary: openSUSE branding for KDE
Group: System/GUI/KDE
Requires: kdelibs4
Supplements: packageand(kdelibs4:branding-openSUSE)
Provides: kdelibs4-branding = %{_kde_branding_version}
Conflicts: otherproviders(kdelibs4-branding)
BuildArch: noarch
%description -n kdelibs4-branding-openSUSE
openSUSE branding for KDE workspace
%package -n ksplashx-branding-openSUSE
Summary: openSUSE branding for KDE splash
Group: System/Fhs
Provides: ksplashx-branding = %{version}
Conflicts: otherproviders(ksplashx-branding)
Supplements: packageand(kdebase4-workspace:branding-openSUSE)
BuildArch: noarch
# links its images
Requires: wallpaper-branding-openSUSE
%description -n ksplashx-branding-openSUSE
openSUSE branding for KDE splash (splashx engine)
%package -n ksplash-qml-branding-openSUSE
Summary: openSUSE branding for KDE splash QML
Group: System/Fhs
Provides: ksplash-qml-branding = %{version}
Conflicts: otherproviders(ksplash-qml-branding)
Supplements: packageand(kdebase4-workspace:branding-openSUSE)
BuildArch: noarch
# links its images
Requires: wallpaper-branding-openSUSE
%description -n ksplash-qml-branding-openSUSE
openSUSE branding for KDE splash (QML engine)
%package -n susegreeter-branding-openSUSE
Summary: openSUSE branding for the KDE greeter
Group: System/Fhs
Provides: susegreeter-branding = %{version}
Conflicts: otherproviders(susegreeter-branding)
BuildArch: noarch
%description -n susegreeter-branding-openSUSE
openSUSE %{version} branding for the KDE greeter welcome screen
%package -n kdm-branding-openSUSE
Summary: openSUSE branding for KDE login and display manager
Group: System/GUI/KDE
PreReq: %fillup_prereq
Supplements: packageand(kdm:branding-openSUSE)
Provides: kde4-kdm-branding-openSUSE = %{version}
Provides: kdm-branding = %{_kde_branding_version}
Obsoletes: kde4-kdm-branding-openSUSE < %{version}
Conflicts: otherproviders(kdm-branding)
BuildArch: noarch
Requires: wallpaper-branding-openSUSE
Requires(post): kdm
%description -n kdm-branding-openSUSE
This package contains openSUSE %{version} branding for kdm, the login and
session manager for KDE.
%prep
%setup -q -c
cp -a openSUSE/LICENSE COPYING
%build
mkdir about
cp /usr/share/kde4/apps/kdeui/about/kde_infopage.css about/
cp /usr/share/kde4/apps/kdeui/about/kde_infopage_rtl.css about/
pushd about/
# need to have latest kdelibs4 in factory
patch -p0 < ../openSUSE/kdelibs/css.diff
popd
%install
mkdir -p %{buildroot}%{_fillupdir}
cp %{SOURCE21} %{buildroot}%{_fillupdir}/
mkdir -p %{buildroot}%{_kde4_appsdir}/kdeui/about
cp -a about/* %{buildroot}%{_kde4_appsdir}/kdeui/about
make -C openSUSE install DESTDIR=%{buildroot}
%suse_update_desktop_file
%{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse/Theme.rc
%suse_update_desktop_file
%{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplash-qml-openSUSE/Theme.rc
rm -rf
%{buildroot}/usr/share/{YaST2,backgrounds,gnome-background-properties,grub2,gimp,pixmaps,plymouth,wallpapers}
%post -n kdm-branding-openSUSE
%{fillup_only -n displaymanager -s kdm}
if [ -f /usr/share/kde4/config/kdm/kdmrc ]; then
sed -i -e 's/elarun/openSUSE/g' /usr/share/kde4/config/kdm/kdmrc
fi
%postun -n kdm-branding-openSUSE
if [ $1 -eq 0 -a -f /usr/share/kde4/config/kdm/kdmrc ]; then
sed -i -e 's/openSUSE/elarun/g' /usr/share/kde4/config/kdm/kdmrc
fi
%files -n kdelibs4-branding-openSUSE
%defattr(-,root,root)
%doc COPYING
%{_kde4_appsdir}/kdeui
%dir %{_kde4_appsdir}/ksplash
%dir %{_kde4_appsdir}/ksplash/Themes
%files -n ksplashx-branding-openSUSE
%defattr(-,root,root)
%{_kde4_appsdir}/ksplash/Themes/ksplashx-suse
%files -n ksplash-qml-branding-openSUSE
%defattr(-,root,root)
%dir %{_kde4_appsdir}/ksplash/Themes/ksplash-qml-openSUSE
%{_kde4_appsdir}/ksplash/Themes/ksplash-qml-openSUSE
%files -n kdm-branding-openSUSE
%defattr(-,root,root)
%doc COPYING
%{_kde4_appsdir}/kdm
%{_fillupdir}/sysconfig.displaymanager-kdm
%files -n susegreeter-branding-openSUSE
%defattr(-,root,root)
/usr/share/kde4/apps/SUSEgreeter
%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
++++++ pre_checkin.sh ++++++
#! /bin/sh
cp branding-openSUSE.changes kde-branding-openSUSE.changes
++++++ sysconfig.displaymanager-kdm ++++++
## Path: Desktop/Display manager
## Description: settings to generate a proper displaymanager config
## Config: kdm
## Type: string
## Default:
#
# Defines extra Server Arguments given to the kdm display manager when
# starting a local display. Useful to override e.g. the -dpi setting.
#
DISPLAYMANAGER_KDM_LOCALARGS=""
## Type: yesno
## Default: yes
#
# Allow local access of the user root to your display manager. Note
# that root can never login if DISPLAYMANAGER_SHUTDOWN is "auto" and
# System/Security/Permissions/PERMISSION_SECURITY is "paranoid".
# This settings currently works only with KDM.
#
DISPLAYMANAGER_ROOT_LOGIN_LOCAL="yes"
