[sqljet] Fix the browser with latest netbeans.
Alexander Kurtakov
akurtakov at fedoraproject.org
Mon Dec 5 16:57:06 UTC 2011
commit ddad77d2bc2dc38e2ec8bef8cea0e72020d5f2d7
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date: Mon Dec 5 18:56:50 2011 +0200
Fix the browser with latest netbeans.
sqljet-browser.sh | 4 ++--
sqljet.spec | 17 ++++++-----------
2 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/sqljet-browser.sh b/sqljet-browser.sh
index 7fa67be..f1308a4 100644
--- a/sqljet-browser.sh
+++ b/sqljet-browser.sh
@@ -3,8 +3,8 @@
MAIN_CLASS=org.tmatesoft.sqljet.browser.DBBrowser
-set_classpath "sqljet sqljet-browser antlr3-runtime"
+set_classpath "sqljet sqljet-browser antlr3-runtime netbeans/swing-outline"
-export CLASSPATH=$CLASSPATH:/usr/share/netbeans/platform12/modules/org-netbeans-swing-outline.jar
+export CLASSPATH=$CLASSPATH
run "$@"
diff --git a/sqljet.spec b/sqljet.spec
index f569d6a..a633b81 100644
--- a/sqljet.spec
+++ b/sqljet.spec
@@ -1,6 +1,6 @@
Name: sqljet
Version: 1.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Pure Java SQLite
Group: Development/Libraries
@@ -23,8 +23,6 @@ BuildRequires: java-devel >= 1.6
BuildRequires: junit4
BuildRequires: desktop-file-utils
Requires: antlr3-java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
BuildArch: noarch
%description
@@ -56,7 +54,7 @@ API documentation for %{name}.
find \( -name '*.class' -o -name '*.jar' \) -delete
pushd sqljet-examples/browser/lib
-ln -s %{_datadir}/netbeans/platform/modules/org-netbeans-swing-outline.jar org-netbeans-swing-outline.jar
+ln -s %{_javadir}/netbeans/swing-outline.jar org-netbeans-swing-outline.jar
popd
# versions in pom xml are to be processed by ant, but we don't need that so just fix them here
@@ -78,7 +76,7 @@ cp -p build/sqljet-browser.jar %{buildroot}%{_javadir}/%{name}-browser.jar
# maven metadata
mkdir -p %{buildroot}%{_mavenpomdir}
cp pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.tmatesoft.sqljet %{name} %{version} JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
# javadocs
mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -93,12 +91,6 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
desktop-file-validate %{buildroot}/%{_datadir}/applications/sqljet-browser.desktop
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/JPP-%{name}.pom
@@ -115,6 +107,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sqljet-browser.deskt
%doc %{_javadocdir}/*
%changelog
+* Mon Dec 5 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0.4-4
+- Fix the browser with latest netbeans.
+
* Tue Jun 28 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0.4-3
- Bump release.
- Adapt to latest netbeans-platform changes.
More information about the scm-commits
mailing list