rpms/sqljet/devel sqljet-browser.sh, 1.1, 1.2 sqljet-browser.desktop, 1.1, 1.2 sqljet.spec, 1.4, 1.5

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/sqljet/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10226/devel

Modified Files:
	sqljet-browser.sh sqljet-browser.desktop sqljet.spec 
Log Message:
* Wed Apr 21 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0.2-3
- Fix build with new antlr3.
- Fix startup script for the browser.
- Add missing semicolon in the desktop file.


Index: sqljet-browser.sh
===================================================================
RCS file: /cvs/pkgs/rpms/sqljet/devel/sqljet-browser.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sqljet-browser.sh	3 Dec 2009 08:45:06 -0000	1.1
+++ sqljet-browser.sh	21 Apr 2010 11:59:12 -0000	1.2
@@ -5,6 +5,6 @@ MAIN_CLASS=org.tmatesoft.sqljet.browser.
 
 set_classpath "sqljet sqljet-browser"
 
-export CLASSPATH=$CLASSPATH:/usr/share/netbeans/platform10/modules/org-netbeans-swing-outline.jar
+export CLASSPATH=$CLASSPATH:/usr/share/netbeans/platform11/modules/org-netbeans-swing-outline.jar
 
 run "$@"


Index: sqljet-browser.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/sqljet/devel/sqljet-browser.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sqljet-browser.desktop	3 Dec 2009 08:45:06 -0000	1.1
+++ sqljet-browser.desktop	21 Apr 2010 11:59:12 -0000	1.2
@@ -5,4 +5,4 @@ Comment=Java browser for sqlite files
 Exec=sqljet-browser
 Terminal=false
 Type=Application
-Categories=Development;Database
+Categories=Development;Database;


Index: sqljet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqljet/devel/sqljet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sqljet.spec	15 Feb 2010 10:14:43 -0000	1.4
+++ sqljet.spec	21 Apr 2010 11:59:12 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           sqljet
 Version:        1.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Pure Java SQLite
 
 Group:          Development/Libraries
@@ -16,13 +16,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  ant
 BuildRequires:  antlr
-BuildRequires:  antlr3
+BuildRequires:  antlr3-java
+BuildRequires:  antlr3-tool
 BuildRequires:  easymock2
 BuildRequires:  netbeans-platform
 BuildRequires:  java-devel >= 1.6
 BuildRequires:  junit4
 BuildRequires:  desktop-file-utils
-Requires:       antlr3
+Requires:       antlr3-java
 
 BuildArch: noarch
 
@@ -55,7 +56,7 @@ API documentation for %{name}.
 find \( -name '*.class' -o -name '*.jar' \) -delete 
 
 pushd lib
-ln -s %{_javadir}/antlr3.jar antlr-runtime-3.1.3.jar
+ln -s %{_javadir}/antlr3-runtime.jar antlr-runtime-3.1.3.jar
 popd
 pushd sqljet-examples/browser/lib
 ln -s %{_datadir}/netbeans/platform11/modules/org-netbeans-swing-outline.jar org-netbeans-swing-outline.jar
@@ -63,7 +64,7 @@ popd
 
 
 %build
-export CLASSPATH=$(build-classpath antlr3 antlr stringtemplate easymock2 junit4)
+export CLASSPATH=$(build-classpath antlr3-runtime antlr3 antlr stringtemplate easymock2 junit4)
 
 ant jars osgi javadoc
 
@@ -115,6 +116,11 @@ rm -rf %{buildroot}
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Apr 21 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0.2-3
+- Fix build with new antlr3.
+- Fix startup script for the browser.
+- Add missing semicolon in the desktop file.
+
 * Mon Feb 15 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0.2-2
 - Rebuild for netbeans-platform update. (rhbz#564657)