Package for 7.8

diff --git a/make/exe/awstats.nsi b/make/exe/awstats.nsi
deleted file mode 100644 (file)
index ed0d009..0000000
--- a/make/exe/awstats.nsi
+++ /dev/null
@@ -1,220 +0,0 @@
-; Nullsoft Scriptable Install System
-; AWStats.nsi
-;
-
-!include "MUI.nsh"
-
-
-!define MUI_PROD "AWStats" ;Define your own software name here
-#!define MUI_VERSION_DOT "7.5" ;Define your own software version here
-!define MUI_PUBLISHER "Laurent Destailleur"
-!define MUI_URL "http://www.awstats.org"
-!define MUI_COMMENTS "copyright 2000/2015 Laurent Destailleur"
-!define MUI_HELPLINK "http://www.awstats.org/docs/index.html"
-!define MUI_URLUPDATE "http://www.awstats.org"
-
-
-
-;--------------------------------
-;Configuration
-
-  ;General
-  Name "AWStats"
-  OutFile "awstats-${MUI_VERSION_DOT}.exe"
-;  Icon "C:\temp\awstats-buildroot\awstats-${MUI_VERSION_DOT}\docs\images\awstats.ico"
-;  UninstallIcon "C:\temp\awstats-buildroot\awstats-${MUI_VERSION_DOT}\docs\images\awstats.ico"
-;  !define MUI_ICON "C:\temp\awstats-buildroot\awstats-${MUI_VERSION_DOT}\docs\images\awstats.ico"
-;  !define MUI_UNICON "C:\temp\awstats-buildroot\awstats-${MUI_VERSION_DOT}\docs\images\awstats.ico"
-  Icon "/tmp/awstats-buildroot/awstats-${MUI_VERSION_DOT}/docs/images/awstats.ico"
-  UninstallIcon "/tmp/awstats-buildroot/awstats-${MUI_VERSION_DOT}/docs/images/awstats.ico"
-  !define MUI_ICON "/tmp/awstats-buildroot\awstats-${MUI_VERSION_DOT}/docs/images/awstats.ico"
-  !define MUI_UNICON "/tmp/awstats-buildroot\awstats-${MUI_VERSION_DOT}/docs/images/awstats.ico"
-
-  BrandingText ""
-;  ShowInstDetails nevershow
-
-  ;Set install dir
-  InstallDir "$PROGRAMFILES\${MUI_PROD}"
-  
-  ;Get install folder from registry if available
-  InstallDirRegKey HKCU "Software\${MUI_PROD}" ""
-
-  CompletedText 'AWStats ${MUI_VERSION_DOT} install completed. Documentation is available in docs directory.'
-
-
-
-;--------------------------------
-;Interface Settings
-
-  !define MUI_ABORTWARNING
-
-
-;--------------------------------
-;Language Selection Dialog Settings
-
-  ;Recupere la langue choisie pour la derniere installation
-  !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" 
-  !define MUI_LANGDLL_REGISTRY_KEY "Software\${MUI_PROD}" 
-  !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
-
-
-;--------------------------------
-;Pages
-
-;  !define MUI_SPECIALBITMAP "C:\temp\awstats-buildroot\awstats-${MUI_VERSION_DOT}\make\exe\awstats_bitmap1.bmp"
-;  !define MUI_HEADERBITMAP "C:\temp\awstats-buildroot\awstats-${MUI_VERSION_DOT}\make\exe\awstats_bitmap2.bmp"
-  !define MUI_SPECIALBITMAP "/tmp/awstats-buildroot\make\exe\awstats_bitmap1.bmp"
-  !define MUI_HEADERBITMAP "/tmp/awstats-buildroot\make\exe\awstats_bitmap2.bmp"
-
-  !insertmacro MUI_PAGE_WELCOME
-;  !insertmacro MUI_PAGE_LICENSE "C:\temp\awstats-buildroot\awstats-${MUI_VERSION_DOT}\docs\LICENSE.TXT"
-  !insertmacro MUI_PAGE_LICENSE "/tmp/awstats-buildroot/awstats-${MUI_VERSION_DOT}/docs/LICENSE.TXT"
-  !insertmacro MUI_PAGE_DIRECTORY
-  !insertmacro MUI_PAGE_INSTFILES
-
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-
-
-;--------------------------------
-;Languages
- 
-  !insertmacro MUI_LANGUAGE "English"
-  !insertmacro MUI_LANGUAGE "French"
-
-  
-;--------------------------------
-;Reserve Files
-  
-  ;These files should be inserted before other files in the data block
-  ;Keep these lines before any File command
-  ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA)
-  
-  !insertmacro MUI_RESERVEFILE_LANGDLL
-
-
-;--------------------------------
-;Language Strings
-
-  ;Header
-  LangString PERLCHECK_TITLE ${LANG_ENGLISH} "Perl check"
-  LangString PERLCHECK_SUBTITLE ${LANG_ENGLISH} "Check if a working Perl interpreter can be found"
-  LangString SETUP_TITLE ${LANG_ENGLISH} "Setup"
-  LangString SETUP_SUBTITLE ${LANG_ENGLISH} "Building AWStats config files"
-
-  LangString PERLCHECK_TITLE ${LANG_FRENCH} "Verification Perl"
-  LangString PERLCHECK_SUBTITLE ${LANG_FRENCH} "Verifie si un interpreteur Perl operationnel peut etre trouve"
-  LangString SETUP_TITLE ${LANG_FRENCH} "Configuration"
-  LangString SETUP_SUBTITLE ${LANG_FRENCH} "Construction des fichiers de configuration AWStats"
-
-  ;Description
-  LangString AWStats ${LANG_ENGLISH} "AWStats"
-  LangString DESC_AWStats ${LANG_ENGLISH} "AWStats main files"
-
-  LangString AWStats ${LANG_FRENCH} "AWStats"
-  LangString DESC_AWStats ${LANG_FRENCH} "Fichiers AWStats"
-
-
-;--------------------------------
-;Reserve Files
-  
-  ;Things that need to be extracted on first (keep these lines before any File command!)
-  ;Only useful for BZIP2 compression
-;  !insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE
-;  !insertmacro MUI_RESERVEFILE_INSTALLOPTION ;InstallOptions
-;  !insertmacro MUI_RESERVEFILE_LANGDLL ;LangDLL (language selection dialog)
-
-
-
-
-
-;--------------------------------
-;Installer Sections
-
-; Check for a Perl interpreter
-Section "CheckPerl"
-    !insertmacro MUI_HEADER_TEXT "$(PERLCHECK_TITLE)" "$(PERLCHECK_SUBTITLE)"
-CHECKPERL:
-       SearchPath $1 "perl.exe"
-       IfErrors NOPERL PERL
-NOPERL:
-       MessageBox MB_ABORTRETRYIGNORE "The installer did not find any Perl interpreter in your PATH.$\r$\nAWStats can't work without Perl. You must install one to use AWStats (For example the free Perl found at http://activestate.com).$\r$\nContinue setup anyway ?" IDABORT ABORT IDRETRY CHECKPERL
-PERL:
-       GOTO NOABORT
-ABORT:
-       Abort "AWStats ${MUI_VERSION_DOT} setup has been canceled"
-NOABORT:
-SectionEnd
-
-
-; Copy the files into install directory
-Section "AWStats" AWStats
-
-       SetOutPath $INSTDIR
-;      File /r "C:\temp\awstats-buildroot\awstats-${MUI_VERSION_DOT}\*"
-       File /r "Z:\tmp\awstats-buildroot\awstats-${MUI_VERSION_DOT}\*"
-
-       ;Store install folder
-    WriteRegStr HKCU "Software\${MUI_PROD}" "" $INSTDIR
-
-       ;Write uninstall entries
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PROD}" "DisplayName" "${MUI_PROD}"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PROD}" "UninstallString" "$INSTDIR/uninstall.exe"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PROD}" "Publisher" "${MUI_PUBLISHER}"
-
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PROD}" "URLInfoAbout" "${MUI_URL}"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PROD}" "Comments" "${MUI_COMMENTS}"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PROD}" "HelpLink" "${MUI_HELPLINK}"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PROD}" "URLUpdateInfo" "${MUI_URLUPDATE}"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PROD}" "DisplayVersion" "${MUI_VERSION_DOT}"
-
-       ;Create uninstaller
-       WriteUninstaller "uninstall.exe"
-
-SectionEnd
-
-
-; Run setup script
-Section "Create config file" Setup
-    !insertmacro MUI_HEADER_TEXT "$(SETUP_TITLE)" "$(SETUP_SUBTITLE)"
-       SetOutPath $INSTDIR
-       StrLen $2 $1
-       IntCmpU $2 0 NOCONFIGURE
-       ExecWait '"$1" "$INSTDIR\tools\awstats_configure.pl"' $3
-NOCONFIGURE:
-       ExecShell open $INSTDIR\docs\awstats_setup.html SW_SHOWNORMAL 
-       BringToFront
-SectionEnd
-
-
-
-;--------------------------------
-;Descriptions
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${AWStats} $(DESC_AWStats)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
- 
-
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-
-  DeleteRegKey /ifempty HKCU "Software\${MUI_PROD}"
-
-  Delete "$INSTDIR\Uninstall.exe"
-  Delete "$INSTDIR\README.TXT"
-
-  RMDir /r "$INSTDIR\docs"
-  RMDir /r "$INSTDIR\tools"
-  RMDir /r "$INSTDIR\wwwroot"
-  RMDir "$INSTDIR"
-  
-SectionEnd
-
-
-
-
-!define MUI_FINISHPAGE

diff --git a/make/exe/awstats_bitmap1.bmp b/make/exe/awstats_bitmap1.bmp
deleted file mode 100644 (file)
index be72d9e..0000000
Binary files a/make/exe/awstats_bitmap1.bmp and /dev/null differ

diff --git a/make/exe/awstats_bitmap2.bmp b/make/exe/awstats_bitmap2.bmp
deleted file mode 100644 (file)
index 56aff34..0000000
Binary files a/make/exe/awstats_bitmap2.bmp and /dev/null differ

diff --git a/make/rpm/awstats.spec b/make/rpm/awstats.spec
index 092988b183d51d2afa3ddb5dc0e421f029bf84ad..4d017b81d52d4a82a833aebbe8eb00772b6fab2b 100644 (file)
--- a/make/rpm/awstats.spec
+++ b/make/rpm/awstats.spec
@@ -1,7 +1,5 @@
 %define name awstats
 %define version        __VERSION__
-# For Mandrake
-#%define release 1mdk
 # For all other distrib
 %define release 1
 
@@ -20,8 +18,6 @@ BuildArchitectures: noarch
 BuildRoot: /tmp/%{name}-buildroot
 Icon: awstats_logo1.gif
 
-# For Mandrake
-Group: Networking/WWW
 # For all other distrib
 Group: Applications/Internet