OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  r...@openpkg.org
  Module: openpkg-src                      Date:   22-Mar-2009 11:06:29
  Branch: HEAD                             Handle: 2009032210062900

  Modified files:
    openpkg-src/nsis        nsis.spec

  Log:
    cleanup packaging and add more comments

  Summary:
    Revision    Changes     Path
    1.3         +17 -8      openpkg-src/nsis/nsis.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/nsis/nsis.spec
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 nsis.spec
  --- openpkg-src/nsis/nsis.spec        22 Mar 2009 09:57:41 -0000      1.2
  +++ openpkg-src/nsis/nsis.spec        22 Mar 2009 10:06:29 -0000      1.3
  @@ -23,7 +23,7 @@
   
   #   package information
   Name:         nsis
  -Summary:      NullSoft Installer System
  +Summary:      Nullsoft Scriptable Install System
   URL:          http://nsis.sourceforge.net/
   Vendor:       NullSoft
   Packager:     OpenPKG Foundation e.V.
  @@ -48,8 +48,11 @@
   AutoReqProv:  no
   
   %description
  -    NSIS, the Nullsoft Scriptable Install System, is a script-driven
  -    Windows installation system.
  +    Nullsoft Scriptable Install System (NSIS) is a professional,
  +    script-driven Open-Source system to create Windows installers. It is
  +    designed to be as small and flexible as possible and is therefore
  +    very suitable for Internet distribution. This OpenPKG package
  +    contains the compiler and the native Win32 binary artifacts.
   
   %track
       prog nsis = {
  @@ -64,6 +67,7 @@
       %patch -p0
   
   %build
  +    #   configure and build makensis(1)
       export OPENPKG_CCFLAGS="%{l_cxxflags -O} %{l_cppflags}"
       export OPENPKG_LINKFLAGS="%{l_ldflags} -liconv"
       scons \
  @@ -78,13 +82,18 @@
           makensis
   
   %install
  +    #   create installation hierarchy
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/etc/nsis \
           $RPM_BUILD_ROOT%{l_prefix}/share/nsis
  +
  +    #   install default configuration file
       %{l_shtool} install -c -m 644 \
           nsisconf.nsh $RPM_BUILD_ROOT%{l_prefix}/etc/nsis/
  +
  +    #   install the artifacts of the Win32 binary distribution
       mv  "nsis-%{version}/Contrib/Modern UI" \
           "nsis-%{version}/Contrib/Modern-UI"
       mv  "nsis-%{version}/Contrib/Modern UI 2" \
  @@ -99,13 +108,13 @@
       rm -f nsis-%{version}/COPYING
       cp -rp nsis-%{version}/* \
           $RPM_BUILD_ROOT%{l_prefix}/share/nsis/
  +
  +    #   install the native-compiled compiler makensis(1)
       %{l_shtool} install -c -s -m 755 \
           build/release/makensis/makensis \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/nsis/
  -    ( echo "#!/bin/sh"
  -      echo "exec %{l_prefix}/share/nsis/makensis \${1+\"\...@\"}"
  -    ) >$RPM_BUILD_ROOT%{l_prefix}/bin/makensis
  -    chmod 755 $RPM_BUILD_ROOT%{l_prefix}/bin/makensis
  +        $RPM_BUILD_ROOT%{l_prefix}/bin/
  +
  +    #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%config %{l_prefix}/etc/nsis/*'
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to