rpms/jide-oss/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 jide-oss-AquaJidePopupMenuUI.java.patch, 1.1, 1.2 jide-oss.spec, 1.1, 1.2 sources, 1.2, 1.3
Hicham HAOUARI
hicham at fedoraproject.org
Sat Dec 5 02:29:55 UTC 2009
Author: hicham
Update of /cvs/pkgs/rpms/jide-oss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15137/devel
Modified Files:
.cvsignore import.log jide-oss-AquaJidePopupMenuUI.java.patch
jide-oss.spec sources
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 7 Aug 2009 20:31:58 -0000 1.2
+++ .cvsignore 5 Dec 2009 02:29:54 -0000 1.3
@@ -1 +1 @@
-jide-oss-2.7.1-1181svn.tar.bz2
+jide-oss-2.7.6-1340svn.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 7 Aug 2009 20:31:58 -0000 1.1
+++ import.log 5 Dec 2009 02:29:54 -0000 1.2
@@ -1 +1,2 @@
jide-oss-2_7_1-3_1181svn_fc11:HEAD:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677077
+jide-oss-2_7_6-1_1340svn_fc12:HEAD:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980044
jide-oss-AquaJidePopupMenuUI.java.patch:
AquaJidePopupMenuUI.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: jide-oss-AquaJidePopupMenuUI.java.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/jide-oss-AquaJidePopupMenuUI.java.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jide-oss-AquaJidePopupMenuUI.java.patch 7 Aug 2009 20:31:58 -0000 1.1
+++ jide-oss-AquaJidePopupMenuUI.java.patch 5 Dec 2009 02:29:54 -0000 1.2
@@ -1,15 +1,12 @@
-diff -up jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java
---- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig 2009-08-06 13:47:15.841910104 +0100
-+++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java 2009-08-06 13:55:33.894910534 +0100
-@@ -5,14 +5,14 @@
- */
+--- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig 2009-12-05 00:10:39.000000000 +0000
++++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java 2009-12-05 00:27:28.618149194 +0000
+@@ -6,13 +6,13 @@
package com.jidesoft.plaf.aqua;
--
+
-import apple.laf.AquaPopupMenuUI;
-+
+import javax.swing.plaf.PopupMenuUI;
- import com.jidesoft.swing.SimpleScrollPane;
+ import com.jidesoft.plaf.basic.BasicJidePopupMenuUI;
import javax.swing.*;
import javax.swing.plaf.ComponentUI;
Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/jide-oss.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jide-oss.spec 7 Aug 2009 20:31:58 -0000 1.1
+++ jide-oss.spec 5 Dec 2009 02:29:54 -0000 1.2
@@ -1,16 +1,16 @@
# SVN revision used
-%global svnrel 1181
+%global svnrel 1340
Name: jide-oss
-Version: 2.7.1
-Release: 3.%{svnrel}svn%{?dist}
+Version: 2.7.6
+Release: 1.%{svnrel}svn%{?dist}
Summary: Swing component library built on top of Java/Swing
License: GPLv2 with exceptions
Group: Development/Libraries
URL: https://jide-oss.dev.java.net/
#This is an svn snapshot, to get this tarball :
-#then to checkout the project source repository : svn checkout -r %{svnrel} https://jide-oss.dev.java.net/svn/jide-oss/trunk jide-oss --username guest
+#then to checkout the project source repository : svn checkout https://jide-oss.dev.java.net/svn/jide-oss/branches/trunk_%{version} jide-oss --username guest
#create the tarball : tar -cjvf jide-oss-%{version}-%{svnrel}svn.tar.bz2 jide-oss
Source0: %{name}-%{version}-%{svnrel}svn.tar.bz2
@@ -44,19 +44,11 @@ so that more and more developers can lev
building them again.
%package javadoc
-Summary: Javadoc for %{name}
-Group: Documentation
-Requires: %{name} = %{version}
-
-%description javadoc
-Javadoc for %{name}.
-
-%package doc
Summary: User documentation for %{name}
Group: Documentation
Requires: %{name} = %{version}
-%description doc
+%description javadoc
User documentation for %{name}.
%prep
@@ -65,11 +57,11 @@ find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;
sed -i "s|\r||g" LICENSE.txt
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .unknown_character
+%patch1 -p1 -b .replace_aquapopupmenuui
%build
-%ant javadoc jar
+%ant javadoc jar | grep -v sun
%install
rm -rf %{buildroot}
@@ -98,14 +90,7 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_javadocdir}/%{name}
-%files doc
-%defattr(-,root,root,-)
-%doc docs/JIDE_Common_Layer_Developer_Guide.pdf
-
%changelog
-* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-3.1181svn
-- Added doc package.
-
* Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
- Removed Build Dependency on dos2unix.
- Used the svn revision in the rpm name.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 7 Aug 2009 20:31:58 -0000 1.2
+++ sources 5 Dec 2009 02:29:54 -0000 1.3
@@ -1 +1 @@
-c6526fefdeeb452c40593a4e4a86850c jide-oss-2.7.1-1181svn.tar.bz2
+4e1884cf3ec5aa4dba8b44afc128354c jide-oss-2.7.6-1340svn.tar.bz2
More information about the fedora-extras-commits
mailing list