rpms/skinlf/F-9 .cvsignore, 1.2, 1.3 skinlf-nosun-jimi-patch.patch, 1.1, 1.2 skinlf-sun-jdk1.5-xpath-patch.patch, 1.1, 1.2 skinlf.spec, 1.1, 1.2 sources, 1.2, 1.3 skinlf-build-xml-patch.patch, 1.1, NONE skinlf-common-xml-patch.patch, 1.1, NONE skinlf-generate-tarball.sh, 1.1, NONE

mycae mycae at fedoraproject.org
Sat Sep 26 05:08:41 UTC 2009 

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6500

Modified Files:
	.cvsignore skinlf-nosun-jimi-patch.patch 
	skinlf-sun-jdk1.5-xpath-patch.patch skinlf.spec sources 
Removed Files:
	skinlf-build-xml-patch.patch skinlf-common-xml-patch.patch 
	skinlf-generate-tarball.sh 
Log Message:
* Update to CVS : address bug 524784



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Dec 2008 10:22:56 -0000	1.2
+++ .cvsignore	26 Sep 2009 05:08:40 -0000	1.3
@@ -1 +1,2 @@
-skinlf-6.7-clean.tar.gz
+skinlf-6.7cvs20090501-clean.tar.gz
+skinlf-generate-cvs-tarball.sh

skinlf-nosun-jimi-patch.patch:
 ImageUtils.java |   39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

Index: skinlf-nosun-jimi-patch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-9/skinlf-nosun-jimi-patch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf-nosun-jimi-patch.patch	14 Dec 2008 10:22:57 -0000	1.1
+++ skinlf-nosun-jimi-patch.patch	26 Sep 2009 05:08:41 -0000	1.2
@@ -1,77 +1,77 @@
---- src/com/l2fprod/tools/ImageUtils.java	2006-07-22 13:46:18.000000000 +1000
-+++ src/com/l2fprod/tools/ImageUtils.java.new	2008-11-01 14:03:30.000000000 +1100
+--- src/main/com/l2fprod/tools/ImageUtils.java	2006-07-22 13:46:18.000000000 +1000
++++ src/main/com/l2fprod/tools/ImageUtils.java.new	2008-11-01 14:03:30.000000000 +1100
 @@ -6,15 +6,11 @@
- 
- import javax.swing.ImageIcon;
- 
--import com.ibm.imageconversion.*;
--import com.sun.jimi.core.*;
--
-+import javax.imageio.*;
- public class ImageUtils {
- 
-   public static Component bitmapCreator = new javax.swing.JLabel();
-   
--  static BMPDecoder decoder = new BMPDecoder();
--  static BMPEncoder encoder = new BMPEncoder();
- 
-   public static Image loadPng(String pathToImage) throws Exception {
-     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
+ 
+ import javax.swing.ImageIcon;
+ 
+-import com.ibm.imageconversion.*;
+-import com.sun.jimi.core.*;
+-
++import javax.imageio.*;
+ public class ImageUtils {
+ 
+   public static Component bitmapCreator = new javax.swing.JLabel();
+   
+-  static BMPDecoder decoder = new BMPDecoder();
+-  static BMPEncoder encoder = new BMPEncoder();
+ 
+   public static Image loadPng(String pathToImage) throws Exception {
+     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
 @@ -22,29 +18,34 @@
-   }
- 
-   public static void savePng(Image image, String pathToImage) throws Exception {
--    Jimi.putImage(image, pathToImage);
-+    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
-   }
- 
-+  private static String getFileFmt(String pathToImage) throws Exception {
-+    String fmt;
-+    if (pathToImage.toLowerCase().endsWith(".png")) {
-+      return "png";
-+    }
-+    if (pathToImage.toLowerCase().endsWith(".gif")) {
-+      return "gif";
-+    }
-+    if (pathToImage.toLowerCase().endsWith(".bmp")) {
-+      return "bmp";
-+    }
-+    return "";
-+  }
-+  
-   public static void createPicture(String pathToImage, int index, int maxParts,
-                                    String filename, boolean horizontal) {
-     try {
-       System.out.println("working with " + pathToImage);
-       Image image = null;
- 
--      if (pathToImage.toLowerCase().endsWith(".png") ||
--        	pathToImage.toLowerCase().endsWith(".gif")) {
--        image = loadPng(pathToImage);
--      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
--        decoder.setInputFilename(pathToImage);
--        decoder.triggerAction();
--        image = decoder.getResult();
--      } else {
--        throw new Error("do not know how to load " + pathToImage);
--      }
- 
-+      image = Toolkit.getDefaultToolkit().getImage(pathToImage);
-       // if only one image, dump it as it
--	    if (index == 0 && maxParts == 1) {
--        Jimi.putImage(image, filename);
-+      if (index == 0 && maxParts == 1) {
-+        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
-       } else {
-         if (horizontal) {
-           int partHeight = image.getHeight(bitmapCreator) / maxParts;
+   }
+ 
+   public static void savePng(Image image, String pathToImage) throws Exception {
+-    Jimi.putImage(image, pathToImage);
++    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
+   }
+ 
++  private static String getFileFmt(String pathToImage) throws Exception {
++    String fmt;
++    if (pathToImage.toLowerCase().endsWith(".png")) {
++      return "png";
++    }
++    if (pathToImage.toLowerCase().endsWith(".gif")) {
++      return "gif";
++    }
++    if (pathToImage.toLowerCase().endsWith(".bmp")) {
++      return "bmp";
++    }
++    return "";
++  }
++  
+   public static void createPicture(String pathToImage, int index, int maxParts,
+                                    String filename, boolean horizontal) {
+     try {
+       System.out.println("working with " + pathToImage);
+       Image image = null;
+ 
+-      if (pathToImage.toLowerCase().endsWith(".png") ||
+-        	pathToImage.toLowerCase().endsWith(".gif")) {
+-        image = loadPng(pathToImage);
+-      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
+-        decoder.setInputFilename(pathToImage);
+-        decoder.triggerAction();
+-        image = decoder.getResult();
+-      } else {
+-        throw new Error("do not know how to load " + pathToImage);
+-      }
+ 
++      image = Toolkit.getDefaultToolkit().getImage(pathToImage);
+       // if only one image, dump it as it
+-	    if (index == 0 && maxParts == 1) {
+-        Jimi.putImage(image, filename);
++      if (index == 0 && maxParts == 1) {
++        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
+       } else {
+         if (horizontal) {
+           int partHeight = image.getHeight(bitmapCreator) / maxParts;
 @@ -55,8 +56,8 @@
-           image = grab(image, partWidth * index, 0,
-                        partWidth, image.getHeight(bitmapCreator));
-         }
--        Jimi.putImage(image, filename);
-       }
-+	   ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
-     } catch (Exception e) {
-       System.out.println("error while working with " + pathToImage);
- 	    e.printStackTrace();
+           image = grab(image, partWidth * index, 0,
+                        partWidth, image.getHeight(bitmapCreator));
+         }
+-        Jimi.putImage(image, filename);
+       }
++	   ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
+     } catch (Exception e) {
+       System.out.println("error while working with " + pathToImage);
+ 	    e.printStackTrace();

skinlf-sun-jdk1.5-xpath-patch.patch:
 MsStylesToSkinLF.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: skinlf-sun-jdk1.5-xpath-patch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-9/skinlf-sun-jdk1.5-xpath-patch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf-sun-jdk1.5-xpath-patch.patch	14 Dec 2008 10:22:57 -0000	1.1
+++ skinlf-sun-jdk1.5-xpath-patch.patch	26 Sep 2009 05:08:41 -0000	1.2
@@ -1,11 +1,11 @@
---- src/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java	2006-07-22 13:46:22.000000000 +1000
-+++ src/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java.newer	2008-11-01 14:35:47.000000000 +1100
+--- src/main/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java	2006-07-22 13:46:22.000000000 +1000
++++ src/main/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java.newer	2008-11-01 14:35:47.000000000 +1100
 @@ -9,7 +9,7 @@
- import javax.xml.parsers.DocumentBuilder;
- import javax.xml.parsers.DocumentBuilderFactory;
- 
--import org.apache.xpath.XPathAPI;
-+import com.sun.org.apache.xpath.internal.XPathAPI;
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
- 
+ import javax.xml.parsers.DocumentBuilder;
+ import javax.xml.parsers.DocumentBuilderFactory;
+ 
+-import org.apache.xpath.XPathAPI;
++import com.sun.org.apache.xpath.internal.XPathAPI;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.Element;
+ 


Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-9/skinlf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf.spec	14 Dec 2008 10:22:57 -0000	1.1
+++ skinlf.spec	26 Sep 2009 05:08:41 -0000	1.2
@@ -1,18 +1,20 @@
+%define cvsver cvs20090501
+
 Name:		skinlf	
 Version:	6.7
-Release:	6%{?dist}
+Release:	9.%{cvsver}%{?dist}
 Summary:	Skin look and feel Skinning library for java
 
 Group:		Development/Libraries
-License:	ASL 2.0 and zlib and ASL 1.1
+License:	ASL 2.0
 URL:		http://skinlf.dev.java.net/	
 
-Source0: %{name}-%{version}-clean.tar.gz
+Source0:	%{name}-%{version}%{cvsver}-clean.tar.gz
 # Original Source# Contains code that we cannot ship. 
 # Download the upstream tarball and invoke this script while in the
-# tarball's directory
-# ./skinlf-generate-tarball.sh 6.7-20060722 
-Source1: %{name}-generate-tarball.sh
+# tarball's directory. Must perform co as specified in sh file.
+# ./skinlf-generate-cvs-tarball.sh
+Source1:	%{name}-generate-cvs-tarball.sh
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,23 +24,20 @@ BuildArch:	noarch
 #for patchset maintained by Scilab developer, Sylvestre Ledru.
 # These patches have been modified.
 Patch0:		skinlf-nosun-jimi-patch.patch	
-#Release file does not contain building tools. thats CVS only. Don't know which CVS revision to check out for release CVS.
-Patch1:		skinlf-build-xml-patch.patch
-#Create common.xml as release omits building tools
-Patch2:		skinlf-common-xml-patch.patch
 #org.apache.xpath has been removed from JDK1.5 and above
 #patch to use com.sun.org.apache.xpath.internal.XPathAPI instead 
-Patch3:		skinlf-sun-jdk1.5-xpath-patch.patch
+Patch1:		skinlf-sun-jdk1.5-xpath-patch.patch
 
 BuildRequires:	ant-nodeps
 BuildRequires:	laf-plugin
 BuildRequires:	dos2unix
-BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils
-BuildRequires:  ant
+BuildRequires:	java-devel >= 1:1.6.0
+BuildRequires:	jpackage-utils
+BuildRequires:	ant
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
+
 #This depends upon laf-plugin
 #https://bugzilla.redhat.com/show_bug.cgi?id=461407
 Requires:	laf-plugin
@@ -47,36 +46,34 @@ Requires:	laf-plugin
 
 
 %description
-Skin Look And Feel is a java framework that is  able to read GTK (The
+Skin Look And Feel is a java framework that is able to read GTK (The
 Gimp ToolKit) and KDE (The K Desktop Environment) skins to enhance
 your application.
 SkinLF supports GUI controls such as Buttons, Checks, Radios, Scrollbars,
-Progress Bar, Lists,  Tables, Internal Frames, Colors, Background
+Progress Bar, Lists, Tables, Internal Frames, Colors, Background
 Textures, Regular Windows.
 
 %prep
-%setup -q
+%setup -q -n %{name} 
 %patch0
-
-#building patches
 %patch1
-%patch2
-#Code fixing
-%patch3
 
-#dos2unix Doc files
-for i in "CHANGES README LICENSE LICENSE_nanoxml" ;
+#convert Doc files to unix format
+for file in AUTHORS README LICENSE LICENSE_nanoxml ;
 do
-	dos2unix -d2u $i;
+	sed 's/\r//' $file > $file.new && \
+	touch -r $file $file.new && \
+	mv $file.new $file
 done
 
 #Remove jar files
 rm -f ./lib/examples.jar 
 rm -f ./lib/nativeskin.jar 
 rm -f ./lib/skinlf.jar 
-
-#rm due to dubious license
-rm -f ./src/examples/Clock.java
+rm -f ./lib/sunawt.jar
+rm -f ./lib/laf-plugin*.jar
+rm -f ./lib/proguard.jar
+rm -f ./lib/imageconversion.jar
 
 #Sanitise package -- disallow jar files
 JAR_files=""
@@ -92,8 +89,10 @@ if [ ! -z "$JAR_files" ] ; then
 	exit 1
 fi
 
+
 %build
-ant 
+export CLASSPATH=$(build-classpath laf-plugin)
+ant -Dbuild.sysclasspath=first
 #Construct-a-jar Dont use ant jar as it tries to unpack laf-plugin
 pushd build/classes
 jar cf %{name}-%{version}.jar .
@@ -113,17 +112,27 @@ rm -rf %{buildroot} 
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README LICENSE  LICENSE_nanoxml
+%doc README LICENSE LICENSE_nanoxml
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
 
 %changelog
-*Sat Dec 06 2008  <mycae(a!t)yahoo.com> 6.7-6
+*Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9cvs20090501
+- Modify to ASL 2.0, upstream has relicenced - fix bug #524784
+- Use CVS co, as upstream does not provide release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.7-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+*Sat Dec 06 2008 <mycae(a!t)yahoo.com> 6.7-6
 - Fixed jar dir
 - Changed primary jar to name-version.jar, & linked.
 - Added clean tarball generator 
 
-* Wed Dec 03 2008  <mycae(a!t)yahoo.com> 6.7-5
+* Wed Dec 03 2008 <mycae(a!t)yahoo.com> 6.7-5
 - Added LICENSE_nanoxml
 - Updated licence spec line to include ASL 1.1 & zlib
 - removed Clock.java due to incompatible license


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Dec 2008 10:22:57 -0000	1.2
+++ sources	26 Sep 2009 05:08:41 -0000	1.3
@@ -1 +1,2 @@
-3ef43d0f1941b1e338292ce041e57da0  skinlf-6.7-clean.tar.gz
+8239ee8256001401628622396df29d5b  skinlf-6.7cvs20090501-clean.tar.gz
+8112c470effbac62040f3af6f19a8fd7  skinlf-generate-cvs-tarball.sh


--- skinlf-build-xml-patch.patch DELETED ---


--- skinlf-common-xml-patch.patch DELETED ---


--- skinlf-generate-tarball.sh DELETED ---

More information about the fedora-extras-commits mailing list