Mailinglist Archive: opensuse-commit (1855 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package branding-openSUSE for 
openSUSE:Factory
checked in at Wed Sep 28 14:02:40 CEST 2011.



--------
--- branding-openSUSE/branding-openSUSE.changes 2011-09-22 18:04:07.000000000 
+0200
+++ /mounts/work_src_done/STABLE/branding-openSUSE/branding-openSUSE.changes    
2011-09-28 11:51:19.000000000 +0200
@@ -1,0 +2,32 @@
+Wed Sep 28 09:50:10 UTC 2011 - coolo@xxxxxxxx
+
+- adopt ksplashx to new logo position
+
+-------------------------------------------------------------------
+Tue Sep 27 20:33:57 UTC 2011 - coolo@xxxxxxxx
+
+- move ksplashx and kde wallpaper here too
+
+-------------------------------------------------------------------
+Tue Sep 27 14:49:43 UTC 2011 - coolo@xxxxxxxx
+
+- update bootsplash graphics
+
+-------------------------------------------------------------------
+Tue Sep 27 11:31:16 UTC 2011 - coolo@xxxxxxxx
+
+- fix %ifarch logic - and update to azul previews
+
+-------------------------------------------------------------------
+Mon Sep 26 12:32:01 UTC 2011 - vuntz@xxxxxxxxxxxx
+
+- Add missing update-alternatives Requires(post)/Requires(postun)
+  to wallpaper-branding-openSUSE, since this is now using
+  update-alternatives.
+
+-------------------------------------------------------------------
+Fri Sep 23 15:05:20 CEST 2011 - meissner@xxxxxxx
+
+- gfxboot is only on x86_64 and %ix86
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


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

Other differences:
------------------
++++++ branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.aXpflv/_old  2011-09-28 14:02:36.000000000 +0200
+++ /var/tmp/diff_new_pack.aXpflv/_new  2011-09-28 14:02:36.000000000 +0200
@@ -32,10 +32,12 @@
 Source20:       sysconfig.bootsplash-branding-openSUSE
 Source100:      %{name}-COPYING
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
+%ifarch x86_64 %ix86
+%define package_gfxboot 1
+BuildRequires:  gfxboot-devel
+%endif
 Summary:        SuSE Brand File
 BuildRequires:  fribidi
-BuildRequires:  gfxboot-devel
 BuildRequires:  kde4-filesystem
 BuildRequires:  update-desktop-files
 
@@ -43,6 +45,22 @@
 This package contains the file /etc/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
+Group:          System/Boot
+PreReq:         gfxboot >= 4
+Supplements:    packageand(gfxboot:branding-openSUSE)
+Provides:       gfxboot-theme = %{version}
+Provides:       gfxboot-branding = %{version}
+Conflicts:      otherproviders(gfxboot-branding)
+BuildArch:      noarch
+
+%description -n gfxboot-branding-openSUSE
+openSUSE theme for gfxboot (bootloader graphics).
+%endif
+
 %package -n     bootsplash-branding-openSUSE
 License:        BSD3c
 Supplements:    packageand(bootsplash:branding-openSUSE)
@@ -58,18 +76,6 @@
 %description -n bootsplash-branding-openSUSE
 This package contains a theme with openSUSE artwork
 
-%package        -n gfxboot-branding-openSUSE
-Summary:        Graphical bootloader openSUSE theme
-Group:          System/Boot
-PreReq:         gfxboot >= 4
-Supplements:    packageand(gfxboot:branding-openSUSE)
-Provides:       gfxboot-theme = %{version}
-Provides:       gfxboot-branding = %{version}
-Conflicts:      otherproviders(gfxboot-branding)
-
-%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
@@ -77,14 +83,18 @@
 Supplements:    packageand(kdelibs4:branding-openSUSE)
 Provides:       kdelibs4-branding = %{version}
 Conflicts:      otherproviders(kdelibs4-branding)
+BuildArch:      noarch
 
 %description -n kdelibs4-branding-openSUSE
 openSUSE branding for about KDE
 
 %package -n wallpaper-branding-openSUSE
 Summary:        openSUSE default wallpapers
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
 Provides:       wallpaper-branding = %{version}
 Conflicts:      otherproviders(wallpaper-branding)
+BuildArch:      noarch
 
 %description -n wallpaper-branding-openSUSE
 openSUSE wallpapers
@@ -94,10 +104,24 @@
 Provides:       yast2-qt-branding = %{version}
 Conflicts:      otherproviders(yast2-qt-branding)
 Supplements:    packageand(yast2-qt:branding-openSUSE)
+BuildArch:      noarch
 
 %description -n yast2-qt-branding-openSUSE
 openSUSE branding for yast2-qt
 
+%package -n ksplashx-branding-openSUSE
+Summary:        openSUSE branding for KDE splash
+Provides:       ksplashx-branding = %{version}
+Conflicts:      otherproviders(ksplashx-branding)
+Supplements:    packageand(kdebase4-workspace:branding-openSUSE)
+BuildArch:      noarch
+# links its images
+Requires:       bootsplash-branding-openSUSE
+
+%description -n ksplashx-branding-openSUSE
+openSUSE branding for KDE splash
+
+
 %prep
 %setup -c
 cp -a %{SOURCE100} COPYING 
@@ -108,6 +132,7 @@
 VERSION = %{version}
 EOF
 
+%if 0%{?package_gfxboot} > 0
 mkdir gfx
 cp -a /usr/share/gfxboot/themes/openSUSE/ gfx
 list=`cd openSUSE/gfxboot && find -type f`
@@ -119,6 +144,7 @@
 export PATH=/usr/sbin:$PATH
 make
 popd
+%endif
 
 %install
 mkdir -p %{buildroot}%{_sysconfdir}
@@ -131,6 +157,7 @@
 mkdir -p %{buildroot}/var/adm/fillup-templates
 cp %{SOURCE20} %{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
@@ -139,6 +166,7 @@
 
 mkdir %{buildroot}/boot
 touch %{buildroot}/boot/message
+%endif
 
 install -D -m 644 openSUSE/kdelibs/body-background.jpg 
%{buildroot}%{_kde4_appsdir}/kdeui/about/body-background.jpg
 
@@ -175,6 +203,18 @@
 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
+%suse_update_desktop_file  
%{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse/Theme.rc
+
+# as long as its just links, it's better to keep them in wallpaper-branding. 
If we need custom ones, we should split
+install -d %{buildroot}/usr/share/wallpapers/openSUSEdefault/contents/images
+ln -s /usr/share/wallpapers/default-1600x1200.jpg 
%{buildroot}/usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+ln -s /usr/share/wallpapers/default-1920x1200.jpg 
%{buildroot}/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1200.jpg
+cp openSUSE/kde-workspace/screenshot.jpg 
%{buildroot}/usr/share/wallpapers/openSUSEdefault/contents/screenshot.jpg
+cp openSUSE/kde-workspace/metadata.desktop 
%{buildroot}/usr/share/wallpapers/openSUSEdefault/metadata.desktop
+%suse_update_desktop_file 
%{buildroot}/usr/share/wallpapers/openSUSEdefault/metadata.desktop
+
 %post -n bootsplash-branding-openSUSE
 %{fillup_only -ns bootsplash branding-openSUSE }
 perl -pi -e 's/^(THEME=).*/$1"openSUSE"/' /etc/sysconfig/bootsplash
@@ -182,8 +222,11 @@
 /sbin/mkinitrd
 fi
 
+%if 0%{?package_gfxboot} > 0
+
 %post -n gfxboot-branding-openSUSE
 gfxboot --update-theme openSUSE
+%endif
 
 %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
@@ -204,15 +247,20 @@
 %dir /etc/bootsplash
 %dir /etc/bootsplash/themes
 /etc/bootsplash/themes/openSUSE
+%if 0%{?package_gfxboot} > 0
 %exclude %{_sysconfdir}/bootsplash/themes/openSUSE/bootloader
 %exclude %{_sysconfdir}/bootsplash/themes/openSUSE/cdrom
+%endif
 %config /var/adm/fillup-templates/sysconfig.bootsplash-branding-openSUSE
 
+%if 0%{?package_gfxboot} > 0
+
 %files -n gfxboot-branding-openSUSE
 %defattr(-,root,root)
 %{_sysconfdir}/bootsplash/themes/openSUSE/bootloader
 %{_sysconfdir}/bootsplash/themes/openSUSE/cdrom
 %ghost /boot/message
+%endif
 
 %files -n kdelibs4-branding-openSUSE
 %defattr(-,root,root)
@@ -235,4 +283,11 @@
 %dir /usr/share/YaST2/theme/openSUSE
 /usr/share/YaST2/theme/openSUSE/wizard
 
+%files -n ksplashx-branding-openSUSE
+%defattr(-,root,root)
+%dir /usr/share/kde4
+%dir /usr/share/kde4/apps
+%dir /usr/share/kde4/apps/ksplash
+/usr/share/kde4/apps/ksplash/Themes
+
 %changelog

++++++ openSUSE.tar.gz ++++++
branding-openSUSE/openSUSE.tar.gz 
/mounts/work_src_done/STABLE/branding-openSUSE/openSUSE.tar.gz differ: char 5, 
line 1



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



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx