X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=JXplorer.spec;h=a62d4be0a1a0203dfc719c9a530e058fab93ecff;hb=2dcd1cb8b2b253da3d6a7284ed61f6e5e68f07aa;hp=59075d5c3b31b041ca6d9356bf2de3c488be1d4b;hpb=9b3af0ccc55933e464c70c13a0e09cfdc0f56307;p=packages%2FJXplorer.git

diff --git a/JXplorer.spec b/JXplorer.spec
index 59075d5..a62d4be 100644
--- a/JXplorer.spec
+++ b/JXplorer.spec
@@ -1,10 +1,11 @@
-#
-%include	/usr/lib/rpm/macros.java
+# NOTE:
+# - it builds with any JDK, but it runs on java-sun only. It's not able to
+#   connect to LDAP on icedtea6
 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
@@ -17,34 +18,37 @@ Source4:	%{name}.desktop
 Patch0:		%{name}-NoInstallAnywhere.patch
 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
-BuildRequires:	icoutils
-Requires:	javahelp
+BuildConflicts:	java-gcj-compat-devel
+Requires:	java-help
+Requires:	java-junit
+Requires:	java-sun-jre-base-X11
 Requires:	jpackage-utils
-Requires:	junit
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-JXplorer is a standards compliant general purpose ldap browser that
-can be used to read and search any ldap directory, or any X.500
-directory with an ldap interface. It is available for immediate free
+JXplorer is a standards compliant general purpose LDAP browser that
+can be used to read and search any LDAP directory, or any X.500
+directory with an LDAP interface. It is available for immediate free
 download under a standard OSI-style open source licence.
 
 %description -l pl.UTF-8
 JXplorer jest zgodną ze standardami przeglądarką LDAP ogólnego
 przeznaczenia. Programu tego można używać do przeglądania i
 modyfikowania dowolnego katalogu LDAP, lub dowolnego katalogu zgodnego
-z X.500 posiadającego interfejs LDAPowy.
+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 +56,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 +70,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
@@ -114,8 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %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
@@ -123,8 +123,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
-
-%doc example.ldif
-%doc licence.txt
-%doc RELEASE.TXT