Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Factory checked in at Fri Sep 23 10:20:58 CEST 2011.
-------- --- branding-openSUSE/branding-openSUSE.changes 2011-09-21 16:40:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/branding-openSUSE/branding-openSUSE.changes 2011-09-22 18:04:07.000000000 +0200 @@ -1,0 +2,36 @@ +Thu Sep 22 16:00:29 UTC 2011 - [email protected] + +- Import logic for the XML file used by GNOME to describe the + default wallpaper from desktop-data-openSUSE: + + Add wallpaper-branding-openSUSE.xml.in and + wallpaper-openSUSE-default-static.xml source files. + + Check in %install that wallpaper-openSUSE-default-static.xml + lists the right default wallpapers. + + Use update-alternatives in %post/%postun of + wallpaper-branding-openSUSE for the openSUSE-default.xml file. +- Remove unneeded GraphicsMagick, fam, inkscape and php5 + BuildRequires. +- Add update-desktop-files and call %suse_update_desktop_file on + the .desktop files describing the wallpapers. + +------------------------------------------------------------------- +Thu Sep 22 15:05:38 UTC 2011 - [email protected] + +- fix backward compat + +------------------------------------------------------------------- +Thu Sep 22 14:05:31 UTC 2011 - [email protected] + +- move yast2-qt branding here + +------------------------------------------------------------------- +Thu Sep 22 13:54:40 UTC 2011 - [email protected] + +- integrate wallpaper logic here too + +------------------------------------------------------------------- +Thu Sep 22 13:05:13 UTC 2011 - [email protected] + +- move details logic into art's Makefile + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bootsplash.php bootsplash.tar.bz2 gfxboot.tar.bz2 New: ---- openSUSE.tar.gz wallpaper-branding-openSUSE.xml.in wallpaper-openSUSE-default-static.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.nC8LGR/_old 2011-09-23 10:20:54.000000000 +0200 +++ /var/tmp/diff_new_pack.nC8LGR/_new 2011-09-23 10:20:54.000000000 +0200 @@ -24,15 +24,20 @@ Group: System/Fhs Provides: branding Conflicts: otherproviders(branding) -Source0: bootsplash.tar.bz2 -Source1: bootsplash.php -Source2: gfxboot.tar.bz2 +# git://gitorious.org/opensuse/art.git +# make -C art/%{version} +Source0: openSUSE.tar.gz +Source10: wallpaper-branding-openSUSE.xml.in +Source11: wallpaper-openSUSE-default-static.xml Source20: sysconfig.bootsplash-branding-openSUSE Source100: %{name}-COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Summary: SuSE Brand File -BuildRequires: GraphicsMagick fam fribidi gfxboot-devel inkscape php5 +BuildRequires: fribidi +BuildRequires: gfxboot-devel +BuildRequires: kde4-filesystem +BuildRequires: update-desktop-files %description This package contains the file /etc/SuSE-brand, and its name is used as @@ -65,9 +70,37 @@ %description -n gfxboot-branding-openSUSE openSUSE theme for gfxboot (bootloader graphics). +%package -n kdelibs4-branding-openSUSE +Summary: KDE Base Libraries: Build Environment +Group: System/GUI/KDE +Requires: kdelibs4 +Supplements: packageand(kdelibs4:branding-openSUSE) +Provides: kdelibs4-branding = %{version} +Conflicts: otherproviders(kdelibs4-branding) + +%description -n kdelibs4-branding-openSUSE +openSUSE branding for about KDE + +%package -n wallpaper-branding-openSUSE +Summary: openSUSE default wallpapers +Provides: wallpaper-branding = %{version} +Conflicts: otherproviders(wallpaper-branding) + +%description -n wallpaper-branding-openSUSE +openSUSE wallpapers + +%package -n yast2-qt-branding-openSUSE +Summary: openSUSE default wallpapers +Provides: yast2-qt-branding = %{version} +Conflicts: otherproviders(yast2-qt-branding) +Supplements: packageand(yast2-qt:branding-openSUSE) + +%description -n yast2-qt-branding-openSUSE +openSUSE branding for yast2-qt + %prep %setup -c -cp -a %{S:0} COPYING +cp -a %{SOURCE100} COPYING %build cat >SuSE-brand <<EOF @@ -75,40 +108,73 @@ VERSION = %{version} EOF -cd bootsplash -php %{SOURCE1} +mkdir 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 -cd .. -cp -a /usr/share/gfxboot/themes/openSUSE/ . -cd openSUSE -tar -xvf %{SOURCE2} -inkscape -w 800 -e data-boot/back.jpg gfxboot/startup.svg -inkscape -w 800 -e data-boot/back.jpg gfxboot/install.svg -inkscape -w 800 -e data-install/welcome.jpg gfxboot/welcome.svg export PATH=/usr/sbin:$PATH make -cd .. +popd %install mkdir -p %{buildroot}%{_sysconfdir} cp SuSE-brand %{buildroot}%{_sysconfdir}/ mkdir -p %{buildroot}/etc/bootsplash/themes -cp -a bootsplash/bootsplash/openSUSE/ %{buildroot}/etc/bootsplash/themes -cp -a %{SOURCE100} %{buildroot}/etc/bootsplash/themes/openSUSE +cp -a openSUSE/bootsplash %{buildroot}/etc/bootsplash/themes/openSUSE +cp -a %{SOURCE100} %{buildroot}/etc/bootsplash/themes/openSUSE/LICENSE mkdir -p %{buildroot}/var/adm/fillup-templates cp %{SOURCE20} %{buildroot}/var/adm/fillup-templates/ install -d -m 755 %{buildroot}/etc/bootsplash/themes/openSUSE/{bootloader,cdrom} -cp openSUSE/bootlogo %{buildroot}/etc/bootsplash/themes/openSUSE/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 openSUSE/{message,po/*.tr,help-boot/*.hlp} %{buildroot}/etc/bootsplash/themes/openSUSE/bootloader +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 +install -D -m 644 openSUSE/kdelibs/body-background.jpg %{buildroot}%{_kde4_appsdir}/kdeui/about/body-background.jpg + +install -d %{buildroot}/usr/share/wallpapers +cp -a openSUSE/wallpapers/* %{buildroot}/usr/share/wallpapers +for i in %{buildroot}/usr/share/wallpapers/*.desktop; do + %suse_update_desktop_file "$i" +done + +## Install xml file used by GNOME to find default wallpaper +install -d %{buildroot}/usr/share/gnome-background-properties +sed "s:@VERSION@:%{version}:g" %{SOURCE10} > %{buildroot}/usr/share/gnome-background-properties/wallpaper-branding-openSUSE.xml +install -m 0644 %{SOURCE11} %{buildroot}/usr/share/wallpapers/openSUSE-default-static.xml +# Touch the file handled with update-alternatives +touch %{buildroot}/usr/share/wallpapers/openSUSE-default.xml +# Check that all files mentioned in branding-default.xml actually exist +for file in `sed "s:<[^>]*>::g" %{SOURCE11} | grep /usr`; do + test -f %{buildroot}/${file} || (echo "${file} is mentioned in %{SOURCE11} but does not exist. Please update %{SOURCE11}, or contact the GNOME team for help."; false ) +done +## Check the wallpaper is correctly set in the xml file for GNOME +for file in %{buildroot}/usr/share/wallpapers/*.desktop; do + case $file in + # default*.desktop are symlinks for KDE to a real wallpaper. + %{buildroot}/usr/share/wallpapers/default*.desktop) + ;; + %{buildroot}/usr/share/wallpapers/openSUSE*.desktop) + IMG=${file#%{buildroot}} + IMG=${IMG%.desktop} + grep -q ${IMG} %{SOURCE11} || ( echo "${IMG} not mentioned in %{SOURCE11}. Please add it there, or contact the GNOME team for help." ; false ) + ;; + esac +done + +install -d %{buildroot}/usr/share/YaST2/theme/openSUSE +cp -a openSUSE/yast_wizard %{buildroot}/usr/share/YaST2/theme/openSUSE/wizard + %post -n bootsplash-branding-openSUSE %{fillup_only -ns bootsplash branding-openSUSE } perl -pi -e 's/^(THEME=).*/$1"openSUSE"/' /etc/sysconfig/bootsplash @@ -119,6 +185,15 @@ %post -n gfxboot-branding-openSUSE gfxboot --update-theme openSUSE +%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 + +%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 +fi + %files %defattr(-,root,root) %doc COPYING @@ -139,4 +214,25 @@ %{_sysconfdir}/bootsplash/themes/openSUSE/cdrom %ghost /boot/message +%files -n kdelibs4-branding-openSUSE +%defattr(-,root,root) +%doc COPYING +%{_kde4_appsdir}/kdeui + +%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/ +# FIXME: It should be owned by a different package: +%dir /usr/share/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/openSUSE +/usr/share/YaST2/theme/openSUSE/wizard + %changelog ++++++ wallpaper-openSUSE-default-static.xml ++++++ <background> <static> <!-- 100 days --> <duration>8640000.0</duration> <file> <size width="1600" height="1200">/usr/share/wallpapers/openSUSE121-1600x1200.jpg</size> <size width="1920" height="1200">/usr/share/wallpapers/openSUSE121-1920x1200.jpg</size> </file> </static> </background> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
