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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   10-Mar-2006 12:19:34
  Branch: HEAD                             Handle: 2006031011193400

  Modified files:
    openpkg-src/ganttproject
                            ganttproject.patch ganttproject.spec

  Log:
    switch to bytecode distribution and upgrade version

  Summary:
    Revision    Changes     Path
    1.3         +32 -13     openpkg-src/ganttproject/ganttproject.patch
    1.7         +24 -27     openpkg-src/ganttproject/ganttproject.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ganttproject/ganttproject.patch
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 ganttproject.patch
  --- openpkg-src/ganttproject/ganttproject.patch       10 May 2005 18:14:49 
-0000      1.2
  +++ openpkg-src/ganttproject/ganttproject.patch       10 Mar 2006 11:19:34 
-0000      1.3
  @@ -1,13 +1,32 @@
  -Index: build.xml
  -diff -Nau build.xml.orig build.xml
  ---- build.xml.orig   2004-12-07 23:12:04.000000000 +0100
  -+++ build.xml        2005-05-10 19:36:04.030015107 +0200
  -@@ -163,6 +163,8 @@
  -                     debug="${debug}"
  -                     deprecation="${deprecation}"
  -                     optimize="${optimize}"
  -+                    source="${source}"
  -+                    nowarn="${nowarn}"
  -                     includeAntRuntime="false">
  -                     <classpath refid="build.classpath"/>
  -             </javac>
  +Index: ganttproject.sh
  +--- ganttproject.sh.orig     2006-02-06 17:31:40 +0100
  ++++ ganttproject.sh  2006-03-10 11:18:39 +0100
  +@@ -1,25 +1,7 @@
  + #!/bin/sh
  +-
  +-GP_HOME=.
  +-
  [EMAIL PROTECTED]@/libexec/ganttproject
  + LOCAL_CLASSPATH=$GP_HOME/eclipsito.jar
  +-
  +-CONFIGURATION_FILE=$GP_HOME/ganttproject-eclipsito-config.xml
  [EMAIL PROTECTED]@/etc/ganttproject/ganttproject-eclipsito-config.xml
  + BOOT_CLASS=org.bardsoftware.eclipsito.Boot
  +-
  +-if [ -z $JAVA_HOME ]; then
  +-  JAVA_COMMAND=`which java`
  +-  if [ "$?" = "1" ]; then
  +-    echo "No executable java found. Please set JAVA_HOME variable";
  +-    exit;
  +-  fi
  +-else
  +-  JAVA_COMMAND=$JAVA_HOME/bin/java
  +-fi
  +-if [ ! -x $JAVA_COMMAND ]; then
  +-  echo "$JAVA_COMMAND is not executable. Please check the permissions."
  +-  exit
  +-fi
  [EMAIL PROTECTED]@/bin/java
  + $JAVA_COMMAND -Xmx256m -classpath $CLASSPATH:$LOCAL_CLASSPATH $BOOT_CLASS 
$CONFIGURATION_FILE $*
  +-
  +-
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ganttproject/ganttproject.spec
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 ganttproject.spec
  --- openpkg-src/ganttproject/ganttproject.spec        1 Jan 2006 13:13:44 
-0000       1.6
  +++ openpkg-src/ganttproject/ganttproject.spec        10 Mar 2006 11:19:34 
-0000      1.7
  @@ -32,24 +32,24 @@
   Class:        EVAL
   Group:        Development
   License:      GPL
  -Version:      1.10.3
  -Release:      20051114
  +Version:      2.0
  +Release:      20060310
   
   #   list of sources
  -Source0:      
http://osdn.dl.sourceforge.net/ganttproject/ganttproject-%{version}-src.zip
  +Source0:      
http://osdn.dl.sourceforge.net/ganttproject/ganttproject-%{version}.zip
   Source1:      http://svn.weird-birds.org/wbc/gan2svg/gan2svg.xsl
   Patch0:       ganttproject.patch
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, JDK, ant, infozip
  +BuildPreReq:  OpenPKG, openpkg >= 20040130, infozip
   PreReq:       OpenPKG, openpkg >= 20040130, JRE
   AutoReq:      no
   AutoReqProv:  no
   
   %description
  -    The ganttproject is a project management tool with a comfortable gui
  +    The ganttproject is a project management tool with a comfortable GUI
       and several output options. A typical manager uses ganttproject for
       building project plans and tracking progress. Gantt charts can be
       saved in a variety of formats, due to a flexible theme based XSLT
  @@ -59,36 +59,33 @@
       prog ganttproject = {
           version   = %{version}
           url       = http://prdownloads.sourceforge.net/ganttproject/
  -        regex     = ganttproject-((?:1\.10\.\d+|2\.\d+(\.\d+)*))-src\.zip
  +        regex     = ganttproject-(__VER__)\.zip
       }
   
   %prep
  -    rm -rf ganttproject-%{version}
  -    unzip -qq %{SOURCE0}
  -    cd ganttproject-%{version}
  +    %setup -c -T
  +    (cd .. && unzip -q %{SOURCE0}) || exit $?
       %patch -p0
   
   %build
  -    cd ganttproject-%{version}
  -    ant -Dsource=1.4 -Dnowarn=on -Ddebug=off -Doptimize=on
   
   %install
  -    ( cd ganttproject-%{version}
  -      rm -rf $RPM_BUILD_ROOT
  -      %{l_shtool} mkdir -f -p -m 755 \
  -          $RPM_BUILD_ROOT%{l_prefix}/bin \
  -          $RPM_BUILD_ROOT%{l_prefix}/libexec/ganttproject
  -      rm data/MANIFEST*
  -      mv data $RPM_BUILD_ROOT%{l_prefix}/libexec/ganttproject
  -      mv lib $RPM_BUILD_ROOT%{l_prefix}/libexec/ganttproject
  -      %{l_shtool} install -c -m 644 \
  -          build/ganttproject*.jar 
$RPM_BUILD_ROOT%{l_prefix}/libexec/ganttproject/lib
  -      %{l_shtool} install -c -m 644 \
  -          %{SOURCE gan2svg.xsl} 
$RPM_BUILD_ROOT%{l_prefix}/libexec/ganttproject/data/resources/xslt
  -      echo '%{l_prefix}/bin/java -jar 
%{l_prefix}/libexec/ganttproject/lib/ganttproject-%{version}.jar $@' \
  -          >$RPM_BUILD_ROOT%{l_prefix}/bin/ganttproject
  -      chmod +x $RPM_BUILD_ROOT%{l_prefix}/bin/ganttproject
  -    ) || exit $?
  +    rm -rf $RPM_BUILD_ROOT
  +    %{l_shtool} mkdir -f -p -m 755 \
  +        $RPM_BUILD_ROOT%{l_prefix}/bin \
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/ganttproject \
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/ganttproject
  +    cp -rp eclipsito.jar plugins \
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/ganttproject/
  +    %{l_shtool} install -c -m 644 \
  +        ganttproject-eclipsito-config.xml \
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/ganttproject/
  +    %{l_shtool} install -c -m 755 %{l_value -s -a} \
  +        ganttproject.sh \
  +        $RPM_BUILD_ROOT%{l_prefix}/bin/ganttproject
  +    %{l_shtool} install -c -m 644 \
  +        %{SOURCE gan2svg.xsl} \
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/ganttproject/
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
   %files -f files
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to