From 26741295774436b42e2718e5d87c74a44ce3bb23 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Mon, 11 Mar 2013 21:22:52 +0100
Subject: [PATCH] update to new opsi builder

---
 CLIENT_DATA/setup.ins                               | 13 ++++++-------
 Liberation-fonts.png.sha1sum                        |  1 -
 builder-product.cfg                                 |  6 ++++--
 ...on_font_alphabet_by_10binary-d41c0wg.png.sha1sum |  1 +
 4 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100644 Liberation-fonts.png.sha1sum
 create mode 100644 liberation_font_alphabet_by_10binary-d41c0wg.png.sha1sum

diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index 9f88b4b..d71e39a 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -4,7 +4,7 @@
 ; credits: http://www.opsi.org/credits/
 
 [Actions]
-requiredWinstVersion >= "4.10.8.6"
+requiredWinstVersion >= "4.11.2.6"
 
 DefVar $ProductId$  
 DefVar $MinimumSpace$
@@ -37,11 +37,10 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ;$ProductId$ should be the name of the product in opsi
 ; therefore please: only lower letters, no umlauts, 
 ; no white space use '-' as a seperator
-Set $ProductId$       = "font.linuxliberation"
 Set $MinimumSpace$    = "10 MB"
 ; the path were we find the product after the installation
-Set $InstallDir32$      = "%ProgramFiles32Dir%\Liberation"
-Set $InstallDir64$      = "%ProgramFiles64Dir%\Liberation"
+Set $InstallDir32$      = "%ProgramFiles32Dir%\LinuxLiberation"
+Set $InstallDir64$      = "%ProgramFiles64Dir%\LinuxLiberation"
 ; ----------------------------------------------------------------
 
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
@@ -50,12 +49,12 @@ if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
-	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 	
 	comment "installing"
 
 	if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
-		Message "Installing " + $ProductId$ + " 32 Bit..."
+		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
 		comment "Copy files"
 		Files_install_32 /32Bit
 		comment "Start setup program"
@@ -68,7 +67,7 @@ else
 	endif
 
 	if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
-		Message "Installing " + $ProductId$ + " 64 Bit..."
+		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
 		comment "Copy files"
 		Files_install_64 /64Bit
 		comment "Start setup program"
diff --git a/Liberation-fonts.png.sha1sum b/Liberation-fonts.png.sha1sum
deleted file mode 100644
index 4e61f2b..0000000
--- a/Liberation-fonts.png.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-154c33487183616bc5fb1c2996843d8627559a9e  /usr/portage/distfiles/Liberation-fonts.png
diff --git a/builder-product.cfg b/builder-product.cfg
index bef8673..77eeb87 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -3,6 +3,8 @@
 ############################
 VENDOR="fedorahosted.org"
 PN="font.linuxliberation"
+NAME="Linux Liberation Free Font"
+DESCRIPTION="Linux Liberation Free Font"
 VERSION="2.00.1"
 RELEASE="3"
 PRIORITY="0"
@@ -14,8 +16,8 @@ TYPE="public"
 
 #
   
-DL_FILE[0]="Liberation-fonts.png"
-DL_SOURCE[0]="http://upload.wikimedia.org/wikipedia/commons/b/b6/Liberation-fonts.png"
+DL_FILE[0]="liberation_font_alphabet_by_10binary-d41c0wg.png"
+DL_SOURCE[0]="http://fc04.deviantart.net/fs71/f/2011/203/2/4/liberation_font_alphabet_by_10binary-d41c0wg.png"
 
 DL_FILE[1]="liberation-fonts-ttf-$VERSION.tar.gz"
 DL_SOURCE[1]="https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-$VERSION.tar.gz"
diff --git a/liberation_font_alphabet_by_10binary-d41c0wg.png.sha1sum b/liberation_font_alphabet_by_10binary-d41c0wg.png.sha1sum
new file mode 100644
index 0000000..5da9843
--- /dev/null
+++ b/liberation_font_alphabet_by_10binary-d41c0wg.png.sha1sum
@@ -0,0 +1 @@
+e374c80c29d99bd15ef0a4ae5ded22c213325baf  /home/mario/.opsi-dist-cache/font.linuxliberation-2.00.1//liberation_font_alphabet_by_10binary-d41c0wg.png