- rel 4

[packages/JXplorer.git] / JXplorer.spec

diff --git a/JXplorer.spec b/JXplorer.spec
index d5354de24594bc0f0b5b9d8a5fbe03d9ef621d06..a05d9f4cc1d0c425cab6b3871cb36975f5c4da13 100644 (file)
--- a/JXplorer.spec
+++ b/JXplorer.spec
@@ -1,9 +1,12 @@
+# NOTE:
+# - it builds with any JDK, but it runs on java-sun only. It's not able to
+#   connect to LDAP on icedtea6
 %include       /usr/lib/rpm/macros.java
 Summary:       LDAP browser
 Summary(pl.UTF-8):     Przeglądarka LDAP
 Name:          JXplorer
 Version:       3.2
-Release:       1
+Release:       4
 License:       Computer Associates Open Source Software License
 Group:         Applications/Databases/Interfaces
 Source0:       http://dl.sourceforge.net/jxplorer/JXv%{version}deploy.tar.bz2
@@ -18,14 +21,16 @@ URL:                http://www.jxplorer.org/
 BuildRequires: ant
 BuildRequires: icoutils
 BuildRequires: jar
+BuildRequires: jdk
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
-BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: rpmbuild(macros) >= 1.553
 BuildRequires: sed >= 4.0
+BuildConflicts:        java-gcj-compat-devel
 Requires:      java-help
+Requires:      java-junit
+Requires:      java-sun-jre-base-X11
 Requires:      jpackage-utils
-Requires:      jre-X11
-Requires:      junit
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -44,7 +49,7 @@ z X.500 posiadającego interfejs LDAP.
 %prep
 %setup -q -b 1 -n jxplorer
 
-%{__sed} -i -e 's,\r$,,' build.xml
+%undos build.xml
 
 icotool -x -o jxplorer.png jxplorer.ico
 
@@ -52,10 +57,8 @@ icotool -x -o jxplorer.png jxplorer.ico
 
 install %{SOURCE2} jxplorer.sh
 install %{SOURCE3} jxconfig.txt
-%{__sed} -i -e 's~==DATADIR==~%{_datadir}/%{name}~g' jxconfig.txt
-
-echo 'JX_JAVADIR=%{_javadir}/%{name}' > jxplorer.sysconfig
-echo 'JX_DATADIR=%{_datadir}/%{name}' >> jxplorer.sysconfig
+%{__sed} -i -e 's~@DATADIR@~%{_datadir}/%{name}~g' jxconfig.txt jxplorer.sh
+%{__sed} -i -e 's~@JVMDIR@~%{_jvmdir}~g' jxplorer.sh
 
 %build
 export JAVA_HOME="%{java_home}"
@@ -68,16 +71,12 @@ export LC_ALL=en_US # source code not US-ASCII
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/sysconfig
-install jxplorer.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/jxplorer
 install -d $RPM_BUILD_ROOT%{_bindir}
 install jxplorer.sh $RPM_BUILD_ROOT%{_bindir}/jxplorer
 
 install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
-install jxplorer.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jxplorer-%{version}.jar
-install jars/help.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/help-%{version}.jar
-ln -s jxplorer-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jxplorer.jar
-ln -s help-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/help.jar
+install jxplorer.jar $RPM_BUILD_ROOT%{_javadir}/jxplorer-%{version}.jar
+ln -s jxplorer-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jxplorer.jar
 
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{htmldocs,icons,images,language,security,conftemplate}
 install htmldocs/* $RPM_BUILD_ROOT%{_datadir}/%{name}/htmldocs
@@ -116,7 +115,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc RELEASE.TXT example.ldif licence.txt
 %attr(755,root,root) %{_bindir}/jxplorer
-%{_javadir}/%{name}
+%{_javadir}/jxplorer.jar
+%{_javadir}/jxplorer-%{version}.jar
 %{_datadir}/%{name}
 %{_pixmapsdir}/jxplorer.png
 %{_desktopdir}/jxplorer.desktop
@@ -124,4 +124,3 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/connections.txt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/log4j.xml
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/jxconfig.txt
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/jxplorer