[jide-oss/f17] - Resolves: rhbz#796342 - Added patch2, jide-oss-name-clash.patch to fix JDK7 name clash - Added an

[Deepak Bhole]

commit 1ef1fe3011150dd7b3058288568ecdc6cd866bea
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Tue Mar 6 16:00:36 2012 -0500

    - Resolves: rhbz#796342
    - Added  patch2, jide-oss-name-clash.patch to fix JDK7 name clash
    - Added and used build requirements for dos2unix and unix2dos

 jide-oss-name-clash.patch |   64 +++++++++++++++++++++++++++++++++++++++++++++
 jide-oss.spec             |   15 ++++++++++-
 2 files changed, 78 insertions(+), 1 deletions(-)
---
diff --git a/jide-oss-name-clash.patch b/jide-oss-name-clash.patch
new file mode 100644
index 0000000..2323107
--- /dev/null
+++ b/jide-oss-name-clash.patch
@@ -0,0 +1,64 @@
+diff -r 94cb46e12d6a jide-oss/src/com/jidesoft/swing/CheckBoxListWithSelectable.java
+--- a/jide-oss/src/com/jidesoft/swing/CheckBoxListWithSelectable.java	Wed Feb 22 08:55:33 2012 +0100
++++ b/jide-oss/src/com/jidesoft/swing/CheckBoxListWithSelectable.java	Wed Feb 22 11:20:38 2012 +0100
+@@ -441,7 +441,7 @@
+     }
+ 
+     @Override
+-    public void setListData(Vector<?> listData) {
++    public void setListData(Vector listData) {
+         super.setListData(wrap(listData));
+     }
+ 
+diff -r 94cb46e12d6a jide-oss/src/com/jidesoft/utils/DateUtils.java
+--- a/jide-oss/src/com/jidesoft/utils/DateUtils.java	Wed Feb 22 08:55:33 2012 +0100
++++ b/jide-oss/src/com/jidesoft/utils/DateUtils.java	Wed Feb 22 11:20:38 2012 +0100
+@@ -244,13 +244,20 @@
+         return calendar;
+     }
+ 
++
++    /*
++     * It looks like both variants of both max and min functions are completely
++     * unused in whole project
++     */
++
++    
+     /**
+      * Returns the minimum Date in the Date list.
+      *
+      * @param dates the list of Date to calculate the minimum.
+      * @return the minimum date in the Date list.
+      */
+-    public static Date min(List<Date> dates) {
++    public static Date minX(List<Date> dates) {
+         long min = Long.MAX_VALUE;
+         Date minDate = null;
+         for (Date value : dates) {
+@@ -269,7 +276,7 @@
+      * @param dates the list of Date to calculate the maximum.
+      * @return the maximum date in the Date list.
+      */
+-    public static Date max(List<Date> dates) {
++    public static Date maxX(List<Date> dates) {
+         long max = Long.MIN_VALUE;
+         Date maxDate = null;
+         for (Date value : dates) {
+@@ -288,7 +295,7 @@
+      * @param calendars the list of Calendar to calculate the minimum.
+      * @return the minimum calendar in the Calendar list.
+      */
+-    public static Calendar min(List<Calendar> calendars) {
++    public static Calendar minY(List<Calendar> calendars) {
+         long min = Long.MAX_VALUE;
+         Calendar minCalendar = null;
+         for (Calendar value : calendars) {
+@@ -307,7 +314,7 @@
+      * @param calendars the list of Calendar to calculate the maximum.
+      * @return the maximum calendar in the Calendar list.
+      */
+-    public static Calendar max(List<Calendar> calendars) {
++    public static Calendar maxY(List<Calendar> calendars) {
+         long max = Long.MIN_VALUE;
+         Calendar maxCalendar = null;
+         for (Calendar value : calendars) {
diff --git a/jide-oss.spec b/jide-oss.spec
index c7f1d7d..35c2c6b 100644
--- a/jide-oss.spec
+++ b/jide-oss.spec
@@ -3,7 +3,7 @@
 
 Name:		jide-oss
 Version:	2.7.6
-Release:	5.%{svnrel}svn%{?dist}
+Release:	6.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
@@ -19,11 +19,14 @@ Source0:	%{name}-%{version}-%{svnrel}svn.tar.bz2
 Patch0:		jide-oss-Eclipse3xJideTabbedPaneUI.java.patch
 #Patch1: use a standard component instead of a vendor specific extension
 Patch1:		jide-oss-AquaJidePopupMenuUI.java.patch
+Patch2:		jide-oss-nameClash.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 
 BuildRequires:	jpackage-utils
+BuildRequires:	dos2unix
+BuildRequires:	unix2dos
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	ant
 
@@ -67,6 +70,11 @@ sed -i "s|\r||g" LICENSE.txt
 
 %patch0 -p1 -b .unknown_character
 %patch1 -p1 -b .replace_aquapopupmenuui
+dos2unix src/com/jidesoft/utils/DateUtils.java
+dos2unix src/com/jidesoft/swing/CheckBoxListWithSelectable.java
+%patch2 -p2
+unix2dos src/com/jidesoft/utils/DateUtils.java
+unix2dos src/com/jidesoft/swing/CheckBoxListWithSelectable.java
 
 %build
 %ant javadoc jar
@@ -103,6 +111,11 @@ rm -rf %{buildroot}
 %doc docs/JIDE_Common_Layer_Developer_Guide.pdf
 
 %changelog
+* Wed Feb 22 2012 Jiri Vanek <jvanek at redhat.com> 2.7.6-6.1340svn
+- Resolves: rhbz#796342
+- Added  patch2, jide-oss-name-clash.patch to fix JDK7 name clash
+- Added and used build requirements for dos2unix and unix2dos
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.6-5.1340svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild