Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Factory checked in at Fri Oct 7 16:06:41 CEST 2011.
-------- --- openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes 2011-10-05 18:02:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/branding-openSUSE/branding-openSUSE.changes 2011-10-07 13:15:47.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Oct 7 11:15:36 UTC 2011 - [email protected] + +- add branding for xfce4 splash screen + +------------------------------------------------------------------- +Thu Oct 6 11:12:51 UTC 2011 - [email protected] + +- prepare to patch kdelibs4 branding from upstream + +------------------------------------------------------------------- +Thu Oct 6 10:07:03 UTC 2011 - [email protected] + +- Keep the touch required by update-alternatives here, instead of + moving it to the Makefile. +- Move check logic to the Makefile. + +------------------------------------------------------------------- +Thu Oct 6 09:59:51 UTC 2011 - [email protected] + +- move install logic in the Makefile + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- branding-openSUSE-COPYING ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.Gm2tFu/_old 2011-10-07 16:06:38.000000000 +0200 +++ /var/tmp/diff_new_pack.Gm2tFu/_new 2011-10-07 16:06:38.000000000 +0200 @@ -29,7 +29,6 @@ Source0: openSUSE.tar.gz Source20: sysconfig.bootsplash-branding-openSUSE Source21: sysconfig.displaymanager-kdm -Source100: %{name}-COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-build %ifarch x86_64 %ix86 %define package_gfxboot 1 @@ -37,7 +36,7 @@ %endif Summary: SuSE Brand File BuildRequires: fribidi -BuildRequires: kde4-filesystem +BuildRequires: kde4-filesystem kdelibs4-branding-upstream BuildRequires: update-desktop-files %description @@ -80,7 +79,7 @@ Group: System/GUI/KDE Requires: kdelibs4 Supplements: packageand(kdelibs4:branding-openSUSE) -Provides: kdelibs4-branding = %{version} +Provides: kdelibs4-branding = %( echo `rpm -q --provides kdelibs4-branding-upstream | grep 'kdelibs4-branding =' | cut -d= -f2` ) Conflicts: otherproviders(kdelibs4-branding) BuildArch: noarch @@ -166,10 +165,16 @@ %description -n kdm-branding-openSUSE This package contains openSUSE branding for kdm, the login and session manager for KDE. +%package -n xfce4-splash-branding-openSUSE +Summary: openSUSE branding for XFCE splash +BuildArch: noarch + +%description -n xfce4-splash-branding-openSUSE +openSUSE branding for the XFCE splash %prep %setup -q -c -cp -a %{SOURCE100} COPYING +cp -a openSUSE/LICENSE COPYING %build cat >SuSE-brand <<EOF @@ -191,116 +196,47 @@ popd %endif -%install -mkdir -p %{buildroot}%{_sysconfdir} -cp SuSE-brand %{buildroot}%{_sysconfdir}/ - -mkdir -p %{buildroot}/etc/bootsplash/themes -cp -a openSUSE/bootsplash %{buildroot}/etc/bootsplash/themes/openSUSE -cp -a %{SOURCE100} %{buildroot}/etc/bootsplash/themes/openSUSE/LICENSE +cp -r /usr/share/kde4/apps/kdeui/about/ about +pushd about +# need to have latest kdelibs4 in factory +# patch -p0 < ../openSUSE/kdelibs/css.diff +popd +%install mkdir -p %{buildroot}/var/adm/fillup-templates cp %{SOURCE20} %{SOURCE21} %{buildroot}/var/adm/fillup-templates/ -%if 0%{?package_gfxboot} > 0 -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 -p %{buildroot}%{_sysconfdir} +cp SuSE-brand %{buildroot}%{_sysconfdir}/ -mkdir %{buildroot}/boot -touch %{buildroot}/boot/message -%endif +mkdir -p %{buildroot}%{_kde4_appsdir}/kdeui/about +cp -a about/* %{buildroot}%{_kde4_appsdir}/kdeui/about -install -D -m 644 openSUSE/kdelibs/body-background.jpg %{buildroot}%{_kde4_appsdir}/kdeui/about/body-background.jpg +# gfxboot themes will soon get a make install - promised by snwint +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/* + mkdir %{buildroot}/boot + touch %{buildroot}/boot/message +fi -install -d %{buildroot}/usr/share/wallpapers -cp -a openSUSE/wallpapers/* %{buildroot}/usr/share/wallpapers +make -C openSUSE install DESTDIR=%{buildroot} for i in %{buildroot}/usr/share/wallpapers/*.desktop; do %suse_update_desktop_file "$i" done - -## Install xml files used by GNOME to find default wallpaper -# Here's the setup we use: -# - /usr/share/wallpapers/openSUSE-default.xml is the default background -# - /usr/share/wallpapers/openSUSE-default.xml is a symlink (via -# update-alternatives) to either: -# a) /usr/share/wallpapers/openSUSE-default-static.xml (from -# wallpaper-branding-openSUSE) -# b) /usr/share/wallpapers/openSUSE-default-dynamic.xml (from -# dynamic-wallpaper-branding-openSUSE) -# - /usr/share/wallpapers/openSUSE-default-dynamic.xml is a symlink to the -# dynamic background (since this XML file moves from a version to another) -# -# Static wallpaper -install -D -m 0644 openSUSE/gnome/wallpaper-branding-openSUSE.xml %{buildroot}/usr/share/gnome-background-properties/wallpaper-branding-openSUSE.xml -install -m 0644 openSUSE/gnome/openSUSE-default-static.xml %{buildroot}/usr/share/wallpapers/openSUSE-default-static.xml -# Dynamic wallpaper -install -d %{buildroot}/usr/share/backgrounds -WALLPAPER_NAME=`cat openSUSE/wallpaper-name` -if test -z "${WALLPAPER_NAME}"; then - echo "Error in the tarball generated from git: openSUSE/wallpaper-name doesn't exist." - false -fi -cp -a openSUSE/gnome/${WALLPAPER_NAME}/ %{buildroot}/usr/share/backgrounds/${WALLPAPER_NAME} -install -D -m 0644 openSUSE/gnome/dynamic-wallpaper-branding-openSUSE.xml %{buildroot}/usr/share/gnome-background-properties/dynamic-wallpaper-branding-openSUSE.xml -ln -s /usr/share/backgrounds/${WALLPAPER_NAME}/${WALLPAPER_NAME}.xml %{buildroot}/usr/share/wallpapers/openSUSE-default-dynamic.xml -# Touch the file handled with update-alternatives -touch %{buildroot}/usr/share/wallpapers/openSUSE-default.xml - -mkdir -p %{buildroot}/usr/share/kde4/apps/SUSEgreeter -cp -p openSUSE/SUSEgreeter/* %{buildroot}/usr/share/kde4/apps/SUSEgreeter - -install -d %{buildroot}/usr/share/YaST2/theme/openSUSE -cp -a openSUSE/yast_wizard %{buildroot}/usr/share/YaST2/theme/openSUSE/wizard - -install -d %{buildroot}/usr/share/kde4/apps/ksplash/Themes -cp -a openSUSE/ksplashx %{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse -ln -s /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg %{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse/1600x1200/background.jpg -mkdir -p %{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse/1920x1200 -ln -s /usr/share/wallpapers/openSUSEdefault/contents/images/1920x1200.jpg %{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse/1920x1200/background.jpg -mkdir -p %{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse/1280x1024 -ln -s /usr/share/wallpapers/openSUSEdefault/contents/images/1280x1024.jpg %{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse/1280x1024/background.jpg -mkdir -p %{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse/1920x1080 -ln -s /usr/share/wallpapers/openSUSEdefault/contents/images/1920x1080.jpg %{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse/1920x1080/background.jpg - %suse_update_desktop_file %{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse/Theme.rc - %suse_update_desktop_file %{buildroot}/usr/share/wallpapers/openSUSEdefault/metadata.desktop - -mkdir -p %{buildroot}%{_kde4_appsdir} -cp -a openSUSE/kdm %{buildroot}%{_kde4_appsdir}/kdm -ln -s /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg %{buildroot}/usr/share/kde4/apps/kdm/themes/SUSE/background-1600x1200.jpg -ln -s /usr/share/wallpapers/openSUSEdefault/contents/images/1920x1200.jpg %{buildroot}/usr/share/kde4/apps/kdm/themes/SUSE/background-1920x1200.jpg -ln -s /usr/share/wallpapers/openSUSEdefault/contents/images/1280x1024.jpg %{buildroot}/usr/share/kde4/apps/kdm/themes/SUSE/background-1280x1024.jpg -ln -s /usr/share/wallpapers/openSUSEdefault/contents/images/1920x1080.jpg %{buildroot}/usr/share/kde4/apps/kdm/themes/SUSE/background-1920x1080.jpg +# Touch the file handled with update-alternatives +touch %{buildroot}/usr/share/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* %check -## Check GNOME-related xml files have contant that make sense -# Check that all files referenced in xml files actually exist -for xml in %{buildroot}/usr/share/wallpapers/openSUSE-default-static.xml %{buildroot}/usr/share/wallpapers/openSUSE-default-dynamic.xml; do - xml_basename=`basename ${xml}` - for file in `sed "s:<[^>]*>::g" ${xml} | grep /usr`; do - test -f %{buildroot}/${file} || (echo "${file} is mentioned in ${xml_basename} but does not exist. Please update ${xml_basename}, or contact the GNOME team for help."; false ) - done -done -# Check that xml files reference all relevant files -for file in %{buildroot}/usr/share/wallpapers/openSUSEdefault/contents/images/*.jpg; do - IMG=${file#%{buildroot}} - grep -q ${IMG} %{buildroot}/usr/share/wallpapers/openSUSE-default-static.xml || ( echo "${IMG} not mentioned in openSUSE-default-static.xml. Please add it there, or contact the GNOME team for help." ; false ) -done -WALLPAPER_NAME=`cat openSUSE/wallpaper-name` -for file in %{buildroot}/usr/share/backgrounds/${WALLPAPER_NAME}/*.jpg; do - IMG=${file#%{buildroot}} - grep -q ${IMG} %{buildroot}/usr/share/wallpapers/openSUSE-default-dynamic.xml || ( echo "${IMG} not mentioned in openSUSE-default-dynamic.xml. Please add it there, or contact the GNOME team for help." ; false ) -done -# Check that the link for the dynamic wallpaper is valid -LINK_TARGET=`readlink --canonicalize %{buildroot}/usr/share/wallpapers/openSUSE-default-dynamic.xml` -test -f "${LINK_TARGET}" || (echo "The link for openSUSE-default-dynamic.xml is invalid. Please fix it, or contact the GNOME team for help."; false ) +make -C openSUSE check DESTDIR=%{buildroot} %post -n bootsplash-branding-openSUSE %{fillup_only -ns bootsplash branding-openSUSE } @@ -420,4 +356,8 @@ %defattr(-,root,root) /usr/share/kde4/apps/SUSEgreeter +%files -n xfce4-splash-branding-openSUSE +%defattr(-,root,root) +/usr/share/pixmaps/xfce4-splash-openSUSE.png + %changelog ++++++ openSUSE.tar.gz ++++++ openSUSE:Factory/branding-openSUSE/openSUSE.tar.gz /mounts/work_src_done/STABLE/branding-openSUSE/openSUSE.tar.gz differ: char 5, line 1 continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
