[Jpackage-commits] dist/jgoodies-looks/devel .cvsignore, 1.1, 1.2 jgoodies-looks-build.patch, NONE, 1.1 jgoodies-looks-no-com-sun.patch, NONE, 1.1 jgoodies-looks-remove-jdk-stuff.patch, NONE, 1.1 jgoodies-looks.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Thu Jun 24 10:03:21 CEST 2010


Update of /home/projects/jpackage/cvs/dist/jgoodies-looks/devel
In directory ryu.zarb.org:/tmp/cvs-serv9208/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jgoodies-looks-build.patch jgoodies-looks-no-com-sun.patch 
	jgoodies-looks-remove-jdk-stuff.patch jgoodies-looks.spec 
Log Message:
Import jgoodies-looks into devel

--- NEW FILE: jgoodies-looks-remove-jdk-stuff.patch ---
diff -ur jgoodies-looks.orig/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java jgoodies-looks/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java
--- jgoodies-looks.orig/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java	2007-04-17 15:08:46.000000000 +0100
+++ jgoodies-looks/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java	2007-11-16 17:20:10.000000000 +0000
@@ -34,12 +34,16 @@
 import java.awt.Insets;
 import java.awt.LayoutManager;
 
-import javax.swing.*;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicSpinnerUI;
 
-import com.jgoodies.looks.common.ExtBasicArrowButtonHandler;
 import com.jgoodies.looks.common.ExtBasicSpinnerLayout;
 
 
@@ -60,56 +64,6 @@
 
 
     /**
-     * The mouse/action listeners that are added to the spinner's 
-     * arrow buttons.  These listeners are shared by all 
-     * spinner arrow buttons.
-     * 
-     * @see #createNextButton
-     * @see #createPreviousButton
-     */
-    private static final ExtBasicArrowButtonHandler nextButtonHandler     
-    							= new ExtBasicArrowButtonHandler("increment", true);
-    private static final ExtBasicArrowButtonHandler previousButtonHandler 
-    							= new ExtBasicArrowButtonHandler("decrement", false);
-
-
-    /**
-     * Create a component that will replace the spinner models value
-     * with the object returned by <code>spinner.getPreviousValue</code>.
-     * By default the <code>previousButton</code> is a JButton
-     * who's <code>ActionListener</code> updates it's <code>JSpinner</code>
-     * ancestors model.  If a previousButton isn't needed (in a subclass)
-     * then override this method to return null.
-     *
-     * @return a component that will replace the spinners model with the
-     *     next value in the sequence, or null
-     * @see #installUI
-     * @see #createNextButton
-     */
-    protected Component createPreviousButton() {
-        return new SpinnerArrowButton(SwingConstants.SOUTH, previousButtonHandler);
-    }
-
-
-    /**
-     * Create a component that will replace the spinner models value
-     * with the object returned by <code>spinner.getNextValue</code>.
-     * By default the <code>nextButton</code> is a JButton
-     * who's <code>ActionListener</code> updates it's <code>JSpinner</code>
-     * ancestors model.  If a nextButton isn't needed (in a subclass)
-     * then override this method to return null.
-     *
-     * @return a component that will replace the spinners model with the
-     *     next value in the sequence, or null
-     * @see #installUI
-     * @see #createPreviousButton
-     */
-    protected Component createNextButton() {
-        return new SpinnerArrowButton(SwingConstants.NORTH, nextButtonHandler);
-    }
-
-
-    /**
      * Create a <code>LayoutManager</code> that manages the <code>editor</code>,
      * <code>nextButton</code>, and <code>previousButton</code> children
      * of the JSpinner. These three children must be added with a constraint
@@ -196,31 +150,4 @@
         }
     }
 
-    /**
-     * It differs from its superclass in that it uses the same formula as JDK
-     * to calculate the arrow height.
-     */
-    private static final class SpinnerArrowButton extends PlasticArrowButton {
-        private SpinnerArrowButton(int direction,
-                ExtBasicArrowButtonHandler handler) {
-            super(direction, UIManager.getInt("ScrollBar.width"), true);
-            addActionListener(handler);
-            addMouseListener(handler);
-        }
-
-        protected int calculateArrowHeight(int height, int width) {
-            int arrowHeight = Math.min((height - 4) / 3, (width - 4) / 3);
-            return Math.max(arrowHeight, 3);
-        }
-        
-        protected int calculateArrowOffset() {
-            return 1;
-        }
-        
-        protected boolean isPaintingNorthBottom() {
-            return true;
-        }
-        
-   }
-
-}
\ No newline at end of file
+}
diff -ur jgoodies-looks.orig/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java jgoodies-looks/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java
--- jgoodies-looks.orig/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java	2007-04-17 15:08:46.000000000 +0100
+++ jgoodies-looks/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java	2007-11-16 17:20:33.000000000 +0000
@@ -30,17 +30,8 @@
 
 package com.jgoodies.looks.plastic;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Graphics;
-
 import javax.swing.JComponent;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.metal.MetalLookAndFeel;
-
-import com.jgoodies.looks.common.ExtBasicArrowButtonHandler;
 
 
 /**
@@ -57,204 +48,4 @@
 		return new PlasticXPSpinnerUI();
 	}
 
-
-    /**
-     * The mouse/action listeners that are added to the spinner's 
-     * arrow buttons.  These listeners are shared by all 
-     * spinner arrow buttons.
-     * 
-     * @see #createNextButton
-     * @see #createPreviousButton
-     */
-    private static final ExtBasicArrowButtonHandler NEXT_BUTTON_HANDLER     
-    							= new ExtBasicArrowButtonHandler("increment", true);
-    private static final ExtBasicArrowButtonHandler PREVIOUS_BUTTON_HANDLER 
-    							= new ExtBasicArrowButtonHandler("decrement", false);
-
-
-    /**
-     * Create a component that will replace the spinner models value
-     * with the object returned by <code>spinner.getPreviousValue</code>.
-     * By default the <code>previousButton</code> is a JButton
-     * who's <code>ActionListener</code> updates it's <code>JSpinner</code>
-     * ancestors model.  If a previousButton isn't needed (in a subclass)
-     * then override this method to return null.
-     *
-     * @return a component that will replace the spinners model with the
-     *     next value in the sequence, or null
-     * @see #installUI
-     * @see #createNextButton
-     */
-    protected Component createPreviousButton() {
-        return new SpinnerXPArrowButton(SwingConstants.SOUTH, PREVIOUS_BUTTON_HANDLER);
-    }
-
-
-    /**
-     * Create a component that will replace the spinner models value
-     * with the object returned by <code>spinner.getNextValue</code>.
-     * By default the <code>nextButton</code> is a JButton
-     * who's <code>ActionListener</code> updates it's <code>JSpinner</code>
-     * ancestors model.  If a nextButton isn't needed (in a subclass)
-     * then override this method to return null.
-     *
-     * @return a component that will replace the spinners model with the
-     *     next value in the sequence, or null
-     * @see #installUI
-     * @see #createPreviousButton
-     */
-    protected Component createNextButton() {
-        return new SpinnerXPArrowButton(SwingConstants.NORTH, NEXT_BUTTON_HANDLER);
-    }
-
-
-    /**
-     * It differs from its superclass in that it uses the same formula as JDK
-     * to calculate the arrow height.
-     */
-    private static final class SpinnerXPArrowButton extends PlasticArrowButton {
-
-        SpinnerXPArrowButton(int direction, ExtBasicArrowButtonHandler handler) {
-            // If you change the value of the button width, don't forget
-            // to change it in PlasticXPBorders#XPSpinnerBorder too.
-            super(direction, UIManager.getInt("ScrollBar.width") - 1, false);
-            addActionListener(handler);
-            addMouseListener(handler);
-        }
-
-        protected int calculateArrowHeight(int height, int width) {
-            int arrowHeight = Math.min((height - 4) / 3, (width - 4) / 3);
-            return Math.max(arrowHeight, 3);
-        }
-                
-        protected boolean isPaintingNorthBottom() {
-            return true;
-        }
-        
-        protected int calculateArrowOffset() {
-            return 1;
-        }
-
-        protected void paintNorth(Graphics g, boolean leftToRight, boolean isEnabled, 
-                Color arrowColor, boolean isPressed, 
-                int width, int height, int w, int h, int arrowHeight, int arrowOffset,
-                boolean paintBottom) {
-            if (!isFreeStanding) {
-                height += 1;
-                g.translate(0, -1);
-                if (!leftToRight) {
-                    width += 1;
-                    g.translate(-1, 0);
-                } else {
-                    width += 2;
-                }
-            }
-
-            // Draw the arrow
-            g.setColor(arrowColor);
-            int startY = 1 + ((h + 1) - arrowHeight) / 2; // KL was (h + 1)
-            int startX = w / 2;
-            // System.out.println( "startX :" + startX + " startY :"+startY);
-            for (int line = 0; line < arrowHeight; line++) {
-                g.fillRect(startX - line - arrowOffset, startY + line,
-                        2 * (line + 1), 1);
-            }
-
-            paintNorthBorder(g, isEnabled, width, height, paintBottom);
-
-            if (!isFreeStanding) {
-                height -= 1;
-                g.translate(0, 1);
-                if (!leftToRight) {
-                    width -= 1;
-                    g.translate(1, 0);
-                } else {
-                    width -= 2;
-                }
-            }
-        }
-
-        private void paintNorthBorder(Graphics g, boolean isEnabled, int w, int h, boolean paintBottom) {
-            if (isEnabled) {
-                boolean isPressed = model.isPressed() && model.isArmed();
-                if (isPressed) {
-                    PlasticXPUtils.drawPressedButtonBorder(g, 0, 1, w - 2, h);
-                } else {
-                    PlasticXPUtils.drawPlainButtonBorder(g, 0, 1, w - 2, h);
-                }
-            } else {
-                PlasticXPUtils.drawDisabledButtonBorder(g, 0, 1, w - 2, h + 1);
-            }
-            // Paint one pixel on the arrow button's left hand side.
-            g.setColor(isEnabled
-                    ? PlasticLookAndFeel.getControlDarkShadow()
-                    : MetalLookAndFeel.getControlShadow());
-            g.fillRect(0, 1, 1, 1);
-
-            if (paintBottom) {
-                g.fillRect(0, h - 1, w - 1, 1);
-            }
-        }
-
-
-        protected void paintSouth(Graphics g, boolean leftToRight, boolean isEnabled,
-                Color arrowColor, boolean isPressed, 
-                int width, int height, int w, int h, int arrowHeight, int arrowOffset) {
-                    
-            if (!isFreeStanding) {
-                height += 1;
-                if (!leftToRight) {
-                    width += 1;
-                    g.translate(-1, 0);
-                } else {
-                    width += 2;
-                }
-            }
-
-            // Draw the arrow
-            g.setColor(arrowColor);
-
-            int startY = (((h + 0) - arrowHeight) / 2) + arrowHeight - 2; // KL was h + 1
-            int startX = w / 2;
-
-            //System.out.println( "startX2 :" + startX + " startY2 :"+startY);
-
-            for (int line = 0; line < arrowHeight; line++) {
-                g.fillRect(startX - line - arrowOffset, startY - line,
-                        2 * (line + 1), 1);
-            }
-
-            paintSouthBorder(g, isEnabled, width, height);
-
-            if (!isFreeStanding) {
-                height -= 1;
-                if (!leftToRight) {
-                    width -= 1;
-                    g.translate(1, 0);
-                } else {
-                    width -= 2;
-                }
-            }
-        }
-
-        private void paintSouthBorder(Graphics g, boolean isEnabled, int w, int h) {
-            if (isEnabled) {
-                boolean isPressed = model.isPressed() && model.isArmed();
-                if (isPressed) {
-                    PlasticXPUtils.drawPressedButtonBorder(g, 0, -2, w - 2, h + 1);
-                } else {
-                    PlasticXPUtils.drawPlainButtonBorder(g, 0, -2, w - 2, h + 1);
-                }
-            } else {
-                PlasticXPUtils.drawDisabledButtonBorder(g, 0, -2, w-2, h + 1);
-            }
-            // Paint one pixel on the arrow button's left hand side.
-            g.setColor(isEnabled
-                    ? PlasticLookAndFeel.getControlDarkShadow()
-                    : MetalLookAndFeel.getControlShadow());
-            g.fillRect(0, h - 2, 1, 1);
-        }
-
-    }
-
-}
\ No newline at end of file
+}

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jgoodies-looks/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	24 Jun 2010 08:01:40 -0000	1.1
--- .cvsignore	24 Jun 2010 08:03:18 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ looks-2_3_1.zip

--- NEW FILE: jgoodies-looks-build.patch ---
--- looks-2.1.3/build.xml.orig	2007-02-21 17:55:14.000000000 +0100
+++ looks-2.1.3/build.xml	2007-04-12 11:45:15.000000000 +0200
@@ -109,8 +109,7 @@
 			optimize     ="${build.compile.optimize}"
             source       ="${build.compile.source}"
 			target       ="${build.compile.target}"
-			verbose      ="${build.compile.verbose}"
-			bootclasspath="${build.boot.classpath}" />
+                        verbose      ="${build.compile.verbose}"/>
 
 		<copy toDir="${build.core.dir}" >
 			<fileset dir="${src.core.dir}" 
@@ -137,7 +136,6 @@
             source       ="${build.compile.source}"
 			target       ="${build.compile.target}"
 			verbose      ="${build.compile.verbose}"
-			bootclasspath="${build.boot.classpath}" 
 		    classpathref ="classpath.demo" />
 	</target>
 
@@ -159,7 +157,6 @@
             source       ="${build.compile.source}"
             target       ="${build.compile.target}"
             verbose      ="${build.compile.verbose}"
-            bootclasspath="${build.boot.classpath}"
             classpathref ="classpath.tests" />
     </target>   
     
@@ -180,7 +177,6 @@
             author="true" 
             version="true" 
             use="true" 
-            link="${javadoc.link}"
             overview="${javadoc.overview}"
             windowtitle="${Name} ${spec.version} API" 
             doctitle="${Name} ${spec.version} API"
@@ -419,4 +415,4 @@
     </target>
     
         
-</project>
\ No newline at end of file
+</project>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jgoodies-looks/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	24 Jun 2010 08:01:40 -0000	1.1
--- sources	24 Jun 2010 08:03:18 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 044fee00e0b81ab025fbeeea2ef40904  looks-2_3_1.zip

--- NEW FILE: jgoodies-looks-no-com-sun.patch ---
--- src/core/com/jgoodies/looks/Options.java.orig	2009-12-26 13:59:54.000000000 +0100
+++ src/core/com/jgoodies/looks/Options.java	2010-06-14 20:16:58.000000000 +0200
@@ -40,8 +40,6 @@
 
 import com.jgoodies.looks.common.ShadowPopup;
 import com.jgoodies.looks.plastic.PlasticLookAndFeel;
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
-import com.sun.java.swing.plaf.windows.WindowsComboBoxUI;
 
 /**
  * Provides access to optional features of the JGoodies L&Fs
@@ -895,12 +893,6 @@
         putLookAndFeelReplacement(
             "javax.swing.plaf.metal.MetalLookAndFeel",
             PLASTIC3D_NAME);
-        putLookAndFeelReplacement(
-            "com.sun.java.swing.plaf.windows.WindowsLookAndFeel",
-            JGOODIES_WINDOWS_NAME);
-        putLookAndFeelReplacement(
-                "com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel",
-                NO_REPLACEMENT);
     }
 
     /**
--- src/demo/com/jgoodies/looks/demo/DemoFrame.java.orig	2009-12-26 13:59:54.000000000 +0100
+++ src/demo/com/jgoodies/looks/demo/DemoFrame.java	2010-06-14 20:21:28.000000000 +0200
@@ -46,7 +46,6 @@
 import com.jgoodies.looks.LookUtils;
 import com.jgoodies.looks.Options;
 import com.jgoodies.looks.plastic.PlasticLookAndFeel;
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
 
 /**
  * Builds the main frame in the Simple Looks Demo.
@@ -218,9 +217,6 @@
             PlasticLookAndFeel.BORDER_STYLE_KEY,
             settings.getToolBarPlasticBorderStyle());
         toolBar.putClientProperty(
-            WindowsLookAndFeel.BORDER_STYLE_KEY,
-            settings.getToolBarWindowsBorderStyle());
-        toolBar.putClientProperty(
             PlasticLookAndFeel.IS_3D_KEY,
             settings.getToolBar3DHint());
 
@@ -384,4 +380,4 @@
     }
 
 
-}
\ No newline at end of file
+}
--- src/demo/com/jgoodies/looks/demo/MenuBarView.java.orig	2009-12-26 13:59:54.000000000 +0100
+++ src/demo/com/jgoodies/looks/demo/MenuBarView.java	2010-06-14 20:25:51.000000000 +0200
@@ -39,7 +39,6 @@
 
 import com.jgoodies.looks.Options;
 import com.jgoodies.looks.plastic.PlasticLookAndFeel;
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
 
 /**
  * Builds the menu bar and pull-down menus in the Simple Looks Demo.
@@ -74,8 +73,6 @@
 							  settings.getMenuBarHeaderStyle());
 		bar.putClientProperty(PlasticLookAndFeel.BORDER_STYLE_KEY,
 							  settings.getMenuBarPlasticBorderStyle());
-		bar.putClientProperty(WindowsLookAndFeel.BORDER_STYLE_KEY,
-							  settings.getMenuBarWindowsBorderStyle());
 		bar.putClientProperty(PlasticLookAndFeel.IS_3D_KEY,
 							  settings.getMenuBar3DHint());
 
@@ -455,4 +452,4 @@
     }
 
 
-}
\ No newline at end of file
+}
--- src/demo/FontTest.java.orig	2009-12-26 13:59:54.000000000 +0100
+++ src/demo/FontTest.java	2010-06-14 20:36:59.000000000 +0200
@@ -11,7 +11,6 @@
 import com.jgoodies.looks.LookUtils;
 import com.jgoodies.looks.plastic.PlasticLookAndFeel;
 import com.jgoodies.looks.plastic.PlasticXPLookAndFeel;
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
 
 
 /**
@@ -275,12 +274,7 @@
 
 
     private FontSet getWindowsFontSet() {
-        try {
-            UIManager.setLookAndFeel(new WindowsLookAndFeel());
-            return WindowsLookAndFeel.getFontPolicy().getFontSet("Windows", UIManager.getDefaults());
-        } catch (UnsupportedLookAndFeelException e) {
             return null;
-        }
     }
 
 
@@ -313,4 +307,4 @@
     }
 
 
-}
\ No newline at end of file
+}

--- NEW FILE: jgoodies-looks.spec ---
# Copyright (c) 2000-2010, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define shortname looks

Name: jgoodies-looks
Summary: Free high-fidelity Windows and multi-platform appearance
URL: http://www.jgoodies.com/freeware/looks/
Group: Development/Libraries
Version: 2.3.1
Release: 1%{?dist}
License: BSD

BuildRequires: jpackage-utils >= 0:5.0.0
BuildRequires: java-devel >= 0:1.6.0
BuildRequires: ant
Requires: java >= 0:1.6.0
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot

Source0: http://www.jgoodies.com/download/libraries/looks/looks-2_3_1.zip
Patch0: %{name}-build.patch
Patch1: %{name}-no-com-sun.patch
Patch2: %{name}-remove-jdk-stuff.patch

%description
The JGoodies look&feels make your Swing applications and applets look better.
They have been optimized for readability, precise micro-design and usability.

Main Benefits:

* Improved readability, legibility and in turn usability.
* Improved aesthetics - looks good on the majority of desktops
* Simplified multi-platform support
* Precise micro-design

%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
%description javadoc
%{summary}.

%prep
%setup -q -n %{shortname}-%{version}
%patch0 -p1 -b .orig

# (taken from Gentoo ebuild)
unzip -j %{shortname}-%{version}.jar META-INF/services/javax.swing.LookAndFeel \
|| die "unzip of javax.swing.LookAndFeel failed"
# and rename it to what build.xml expects
mv javax.swing.LookAndFeel all.txt

# Delete pre-generated stuff we don't want
rm %{shortname}-%{version}.jar
rm -r docs/api

# Delete the whole Windows L&F because it depends on com.sun.java packages
# (Unless we're compiling with a Sun JVM)
%patch1 -p0 -b .orig
rm -r src/core/com/jgoodies/looks/windows

%build
%ant -Ddescriptors.dir=. compile jar javadoc

%install
rm -rf $RPM_BUILD_ROOT
install -dp $RPM_BUILD_ROOT%{_javadir} \
        $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -p build/%{shortname}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
# Fix the line endings!
for file in *.txt *.html docs/*.* docs/guide/*.*; do
    sed -i 's/\r//' $file
done
cd $RPM_BUILD_ROOT%{_javadocdir}
ln -s %{name}-%{version} %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%doc RELEASE-NOTES.txt LICENSE.txt README.html docs/

%files javadoc
%defattr(644,root,root,755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Thu Jun 24 2010 Ralph Apel <r.apel at r-apel.de> - 2.3.1-1
- 2.3.1 - welcome back to JPP :-)

* Tue Nov 20 2007 Mary Ellen Foster <mefoster at gmail.com> - 2.1.4-6
- Add LICENSE.txt to documentation
- Correctly add all files to CVS

* Mon Nov 19 2007 Mary Ellen Foster <mefoster at gmail.com> - 2.1.4-4
- Improved patch to remove questionably-licensed file (now tested!)

* Tue Oct 30 2007 Mary Ellen Foster <mefoster at gmail.com> - 2.1.4-3
- Remove file with questionable license and patch around its use
- Clean up the spec file following review

* Tue Oct 16 2007 Mary Ellen Foster <mefoster at gmail.com> - 2.1.4-2
- Cleaned up spec file and fixed line endings and permissions following
  review

* Mon Jun 11 2007 Mary Ellen Foster <mefoster at gmail.com> - 2.1.4-1
- Upgrade to 2.1.4

* Thu Apr 12 2007 Mary Ellen Foster <mefoster at gmail.com> - 2.1.3-1
- Initial version for Fedora, based on JPackage spec for jgoodies-forms




More information about the JPackage-commits mailing list