Mailinglist Archive: opensuse-commit (1855 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 Wed Sep 21 17:36:01 CEST 2011.



--------
--- branding-openSUSE/branding-openSUSE.changes 2011-09-10 14:37:10.000000000
+0200
+++ /mounts/work_src_done/STABLE/branding-openSUSE/branding-openSUSE.changes
2011-09-21 16:40:55.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Sep 21 14:40:43 UTC 2011 - coolo@xxxxxxxx
+
+- add gfxboot branding here
+
+-------------------------------------------------------------------
+Wed Sep 21 13:41:28 UTC 2011 - coolo@xxxxxxxx
+
+- add bootsplash branding here
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
bootsplash.php
bootsplash.tar.bz2
gfxboot.tar.bz2
sysconfig.bootsplash-branding-openSUSE

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

Other differences:
------------------
++++++ branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.p64WZ8/_old 2011-09-21 17:35:54.000000000 +0200
+++ /var/tmp/diff_new_pack.p64WZ8/_new 2011-09-21 17:35:54.000000000 +0200
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

-# norootforbuild


Name: branding-openSUSE
@@ -25,17 +24,49 @@
Group: System/Fhs
Provides: branding
Conflicts: otherproviders(branding)
-Source: %{name}-COPYING
+Source0: bootsplash.tar.bz2
+Source1: bootsplash.php
+Source2: gfxboot.tar.bz2
+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

%description
This package contains the file /etc/SuSE-brand, and its name is used as
a trigger for installation of correct vendor brand packages.

+%package -n bootsplash-branding-openSUSE
+License: BSD3c
+Supplements: packageand(bootsplash:branding-openSUSE)
+Provides: bootsplash-branding = %{version}
+Summary: openSUSE Bootsplash Theme
+PreReq: %fillup_prereq perl
+Group: System/Boot
+Requires: bootsplash >= 3.3-11
+Requires(post): mkinitrd
+BuildArch: noarch
+Conflicts: otherproviders(bootsplash-branding)
+
+%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).
+
%prep
-%setup -q -T -c
+%setup -c
cp -a %{S:0} COPYING

%build
@@ -44,16 +75,68 @@
VERSION = %{version}
EOF

+cd bootsplash
+php %{SOURCE1}
+
+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 ..
+
%install
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-cp SuSE-brand $RPM_BUILD_ROOT%{_sysconfdir}/
+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
+
+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
+/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
+/usr/share/gfxboot/bin/2hl --link --quiet
%{buildroot}/etc/bootsplash/themes/openSUSE/*
+
+mkdir %{buildroot}/boot
+touch %{buildroot}/boot/message
+
+%post -n bootsplash-branding-openSUSE
+%{fillup_only -ns bootsplash branding-openSUSE }
+perl -pi -e 's/^(THEME=).*/$1"openSUSE"/' /etc/sysconfig/bootsplash
+if test -s /etc/sysconfig/bootloader ; then
+/sbin/mkinitrd
+fi

-%clean
-rm -rf $RPM_BUILD_ROOT
+%post -n gfxboot-branding-openSUSE
+gfxboot --update-theme openSUSE

%files
%defattr(-,root,root)
%doc COPYING
%{_sysconfdir}/SuSE-brand

+%files -n bootsplash-branding-openSUSE
+%defattr(-,root,root)
+%dir /etc/bootsplash
+%dir /etc/bootsplash/themes
+/etc/bootsplash/themes/openSUSE
+%exclude %{_sysconfdir}/bootsplash/themes/openSUSE/bootloader
+%exclude %{_sysconfdir}/bootsplash/themes/openSUSE/cdrom
+%config /var/adm/fillup-templates/sysconfig.bootsplash-branding-openSUSE
+
+%files -n gfxboot-branding-openSUSE
+%defattr(-,root,root)
+%{_sysconfdir}/bootsplash/themes/openSUSE/bootloader
+%{_sysconfdir}/bootsplash/themes/openSUSE/cdrom
+%ghost /boot/message
+
%changelog

++++++ bootsplash.php ++++++
#!/usr/bin/php
<?php
//depends on graphicsmagic and rsvg

$distro = "openSUSE 12.1";
$themename = "openSUSE";
$themepath = "./bootsplash/$themename";
$imagepath = "/etc/bootsplash/themes/$themename/images";
//resolution, jpeg export quality pairs
$resolutions = array("640x480"=>"95", "800x600"=>"95", "1024x600"=>"94",

"1024x768"=>"94", "1152x768"=>"94", "1152x864"=>"93",

"1280x768"=>"93", "1366x768"=>"93", "1280x800"=>"93",

"1280x854"=>"93",

"1280x960"=>"92", "1280x1024"=>"92", "1400x1050"=>"91",

"1440x900"=>"91", "1600x1024"=>"90", "1600x1200"=>"89",

"1600x900"=>"90", "1920x1080"=>"90",

"1680x1050"=>"89", "1920x1200"=>"80", "3200x1200"=>"70");
/*
$resolutions = array("800x600"=>"95");
*/
//create dirs
if (!is_dir($themepath)) {
//print "removing old theme $themename\n\n";
//exec("rm -rf ./theme/$themename");
mkdir ("./bootsplash");
mkdir ("$themepath");
mkdir ("$themepath/config");
mkdir ("$themepath/images");
}
//create logos
if (!is_dir('./temp')) {
mkdir ("./temp");
}
$cmd = "inkscape -w 180 -e ./temp/logo.png logo.svg"; //silent logo
exec($cmd);
$cmd = "inkscape -w 90 -e ./temp/logov.png logo.svg"; //verbose logo
exec($cmd);
$cmd = "gm convert -comment \"id logo deltabg stop\" ./temp/logo.png
./temp/logo.png ./temp/logo.mng";
exec($cmd);
$cmd = "gm convert -colorspace gray -comment \"id logov deltabg stop\"
./temp/logov.png ./temp/logov.png ./temp/logov.mng";
exec($cmd);

#exec("/usr/local/bin/convert ./building-blocks/logo.png
$themepath/images/logo.mng");
copy("./temp/logo.mng", "$themepath/images/logo.mng");
copy("./temp/logov.mng", "$themepath/images/logov.mng");

while (list($res,$q) = each($resolutions)) {
//scale backgrounds

print "creating $res resolution images\n";
$in = "./background.png";
$inverb = "./background-verbose.png";
$silent = "$themepath/images/silent-$res.jpg";
$verbose = "$themepath/images/bootsplash-$res.jpg";
$cmd = "gm convert $in -geometry $res\! -quality $q -interlace None
-colorspace YCbCr ";
$cmd .= " -sampling-factor 2x2 $silent";
exec($cmd);
$cmd = "gm convert $inverb -geometry $res\! -quality $q -interlace None
-colorspace YCbCr ";
$cmd .= " -sampling-factor 2x2 $verbose";
#$cmd = "gm convert $in -colorspace gray -geometry $res\! -quality $q
-interlace None ";
#$cmd .= "-colorspace YCbCr -sampling-factor 2x2 $verbose";
exec($cmd);

//generate config files
print "Generating config file for $res\n";
$fp = fopen("$themepath/config/bootsplash-$res.cfg", "w");

fwrite($fp, "# This is a bootsplash configuration file for\n");
fwrite($fp, "# $distro, resolution $res.\n");
fwrite($fp, "#\n");
fwrite($fp, "# See www.bootsplash.org for more information.\n");
fwrite($fp, "# created by SUSE Image Builder\n");
fwrite($fp, "#\n");
fwrite($fp, "version=3\n"); //config file version
fwrite($fp, "state=1\n"); //picture is diplayed
fwrite($fp, "progress_enable=0\n"); //no progress
fwrite($fp, "overpaintok=1\n"); //no clue what this is
fwrite($fp, "\n\n");
//colors
fwrite($fp, "fgcolor=7\n");
fwrite($fp, "bgcolor=0\n\n");
//text window frame
ereg("([0-9]+)x([0-9]+)", $res, $dimensions);
$x = $dimensions[1];
$y = $dimensions[2];
$tx = 20;
$ty = 60;
$tw = $x - $tx - 10;
$th = $y - $ty;
fwrite($fp, "tx=$tx\n");
fwrite($fp, "ty=$ty\n");
fwrite($fp, "tw=$tw\n");
fwrite($fp, "th=$th\n");
//background
fwrite($fp, "\n\njpeg=$imagepath/bootsplash-$res.jpg\n");
fwrite($fp, "silentjpeg=$imagepath/silent-$res.jpg\n");
fwrite($fp, "\n\n");
$lx = round($x/2);
$ly = round($y/2)-20;
fwrite($fp, "mnganim logo $imagepath/logo.mng initframe logo silent
center $lx $ly\n");

//overlay title (verbose)
$vlx = 2;
$vly = 2;
fwrite($fp, "mnganim logov $imagepath/logov.mng initframe logov origin
0 $vlx $vly\n");

//animation triggers
fwrite($fp, "trigger \"isdown\" quit\n");
fwrite($fp, "trigger \"rlreached 5\" toverbose\n");
fwrite($fp, "trigger \"rlchange 0\" tosilent\n");
fwrite($fp, "trigger \"rlchange 6\" tosilent\n");

$verticalpcnt = 0.8;
$width = 160; //width of the progress bar
$voffset = 80; //vertical offset from the title (defined by
verticalpcnt above)
$x1 = $lx - round($width/2) - 4;
$x2 = $x1 + $width;
//$y1 = round($verticalpcnt*$y);
$y1 = round($ly+$voffset);
$y2 = $y1+1; //let's try a 2 pixel line
fwrite($fp, "\n\n");
fwrite($fp, "progress_enable=1\n"); //enable progress
fwrite($fp, "box silent noover $x1 $y1 $x2 $y2 #ffffff10\n");
//progress background
$wl = "box silent inter " . $x1 . " " . ($y1 - 1) . " " . $x1 . " " .
($y1 + 1) . " #ffffff80\n";
fwrite($fp, $wl); //starting point ...
$wl = "box silent " . $x1 . " " . ($y1 - 1) . " " . $x2 . " " . ($y2 +
1) . " #ffffff80\n";
fwrite($fp, $wl); //..iterated to this

fclose($fp);
}

?>
++++++ sysconfig.bootsplash-branding-openSUSE ++++++

## Path: System/Boot
## Description: selects bootsplash graphics theme
## Type: string
## Default: ""
## Command: /sbin/mkinitrd
#
# Bootsplash theme. Should be based in /etc/bootsplash/themes/.
#
THEME="openSUSE"

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



Remember to have fun...

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

< Previous Next >