[Commits] (bear) fixes for bug 2607 and bug 2650 r=heikki

[commits at osafoundation.org]

Commit by: bear
Modified files:
internal/installers/rpm/chandler.spec 1.6 1.7
internal/installers/rpm/makeinstaller.sh 1.4 1.5
internal/installers/win/chandler.nsi 1.10 1.11

Log message:
fixes for bug 2607 and bug 2650 r=heikki


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/installers/rpm/chandler.spec.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/internal/installers/rpm/makeinstaller.sh.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/internal/installers/win/chandler.nsi.diff?r1=text&tr1=1.10&r2=text&tr2=1.11

Index: internal/installers/rpm/chandler.spec
diff -u internal/installers/rpm/chandler.spec:1.6 internal/installers/rpm/chandler.spec:1.7
--- internal/installers/rpm/chandler.spec:1.6	Thu Mar 10 15:30:10 2005
+++ internal/installers/rpm/chandler.spec	Wed Mar 16 10:49:21 2005
@@ -12,8 +12,8 @@
 # a Source/Source0 entry)
 #
 
-Version: $DISTRIB_VERSION
-Release: $DISTRIB_RELEASE
+Version: %{_dv}
+Release: %{_dr}
 Summary: Chandler - an Open Source Personal Information Manager
 Name: Chandler
 License: GPLv2

Index: internal/installers/rpm/makeinstaller.sh
diff -u internal/installers/rpm/makeinstaller.sh:1.4 internal/installers/rpm/makeinstaller.sh:1.5
--- internal/installers/rpm/makeinstaller.sh:1.4	Thu Mar 10 15:30:10 2005
+++ internal/installers/rpm/makeinstaller.sh	Wed Mar 16 10:49:21 2005
@@ -8,8 +8,8 @@
 SPEC_FILE="$2"
 DISTRIB_PATH="$3"
 DISTRIB_FILE="$4"
-export DISTRIB_VERSION="$5"
-export DISTRIB_RELEASE="$6"
+DISTRIB_VERSION="$5"
+DISTRIB_RELEASE="$6"
 
 RPM_PATH=$HOME/rpm
 
@@ -23,6 +23,10 @@
 fi
 
 if [ -d "$RPM_PATH/BUILD" ]; then
+    echo "Clearing RPMS/i386 tree"
+    if [ -d "$RPM_PATH/RPMS/i386" ]; then
+        rm -rf $RPM_PATH/RPMS/i386/*
+    fi
     echo "Preparing build tree"
     if [ -d "$RPM_PATH/BUILD/OSAF" ]; then
         rm -rf $RPM_PATH/BUILD/OSAF
@@ -38,7 +42,7 @@
     chmod -R a+r $RPM_PATH/BUILD/OSAF/usr/local/chandler/
     cd $SPEC_PATH
     echo "Calling rpm -ba $SPEC_FILE"
-    rpmbuild -ba $SPEC_FILE
+    rpmbuild -ba --define "_dv $DISTRIB_VERSION" --define "_dr $DISTRIB_RELEASE" $SPEC_FILE
     echo "Moving $RPM_PATH/RPMS/i386/Chandler-$DISTRIB_VERSION-$DISTRIB_RELEASE.i386.rpm to $DISTRIB_PATH/$DISTRIB_FILE.i386.rpm"
     mv $RPM_PATH/RPMS/i386/Chandler-$DISTRIB_VERSION-$DISTRIB_RELEASE.i386.rpm $DISTRIB_PATH/$DISTRIB_FILE.i386.rpm
     echo "Clearing build tree"

Index: internal/installers/win/chandler.nsi
diff -u internal/installers/win/chandler.nsi:1.10 internal/installers/win/chandler.nsi:1.11
--- internal/installers/win/chandler.nsi:1.10	Thu Mar 10 15:30:10 2005
+++ internal/installers/win/chandler.nsi	Wed Mar 16 10:49:21 2005
@@ -1,5 +1,5 @@
-; $Revision: 1.10 $
-; $Date: 2005/03/10 23:30:10 $
+; $Revision: 1.11 $
+; $Date: 2005/03/16 18:49:21 $
 ; Copyright (c) 2004,2005 Open Source Applications Founation
 ; http://osafoundation.org/Chandler_0.1_license_terms.htm
 
@@ -29,14 +29,8 @@
 !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
 
-; Language Selection Dialog Settings
-!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
-!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
-!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
-
 ; Wizard pages
 !insertmacro MUI_PAGE_WELCOME
-; !insertmacro MUI_PAGE_LICENSE "..\..\..\${DISTRIB_DIR}\LICENSE.txt"
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 
@@ -52,10 +46,6 @@
 
 ; Language files
 !insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "German"
-!insertmacro MUI_LANGUAGE "Japanese"
-!insertmacro MUI_LANGUAGE "Spanish"
 
 ; MUI end ------
 
@@ -68,12 +58,6 @@
 ShowInstDetails nevershow
 ShowUnInstDetails nevershow
 
-  ; show the language selection dialog before any UI pages are displayed
-
-Function .onInit
-  ;!insertmacro MUI_LANGDLL_DISPLAY
-FunctionEnd
-
 Function change_cancel_text
 
   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "CancelEnabled" "0"
@@ -132,7 +116,6 @@
 FunctionEnd
 
 Function un.onInit
-  ;!insertmacro MUI_UNGETLANGUAGE
   MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
   Abort
 FunctionEnd