- use system jss

- don't mess outside buildsubdir

Changed files:
    fedora-console.spec -> 1.8

diff --git a/fedora-console.spec b/fedora-console.spec
index 0aed1692d9e26c6d9be362fe9b12d7dfc55149c4..3fbb9c1ae144c7cd0ecfaa75a466d34422fcf871 100644 (file)
--- a/fedora-console.spec
+++ b/fedora-console.spec
@@ -1,20 +1,20 @@
-# TODO: package jss and use system package
 Summary:       Fedora DS Java Remote Management Console
 Summary(pl):   Konsola w Javie do zdalnego zarz±dzania serwerem Fedora DS
 Name:          fedora-console
-Version:       1.0.2
+Version:       1.0.3
 Release:       0.1
 License:       LGPL
 Group:         Applications
 Source0:       http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
-# Source0-md5: cc2ccdf7a0f0a1ce78326251105a12f9
-Source1:       ftp://ftp.mozilla.org/pub/mozilla.org/security/jss/releases/JSS_3_3_RTM/jss33.jar
-# Source1-md5: efcae3a220aba17bf98cdcb6c36fc55e
+# Source0-md5: 3d3f05dc680dd09212aef7f0e271085e
 URL:           http://directory.fedora.redhat.com/wiki/Client_software
 BuildRequires: ant >= 1.6
 BuildRequires: jdk
-#BuildRequires:        jss >= 3.6
+BuildRequires: jss >= 3.3
 BuildRequires: ldapsdk >= 4.17
+Requires:      jre
+Requires:      jss >= 3.3
+Requires:      ldapsdk >= 4.17
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,24 +27,24 @@ Administration Server i Fedora Directory Server.
 
 %prep
 %setup -q
-install %{SOURCE1} ./jss3.jar
 
 %build
-ant -Djss.local.location=.
+%ant \
+       -Dbuilt.dir="`pwd`/built"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-install ../built/release/jars/fedora-* $RPM_BUILD_ROOT%{_datadir}/%{name}
+install built/release/jars/fedora-* $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -d $RPM_BUILD_ROOT%{_bindir}
 install startconsole $RPM_BUILD_ROOT%{_bindir}
 
 cd $RPM_BUILD_ROOT%{_datadir}/%{name}
-ln -s fedora-base-1.0.jar fedora-base-%{version}.jar
-ln -s fedora-mcc-1.0.jar fedora-mcc-%{version}.jar
-ln -s fedora-mcc-1.0_en.jar fedora-mcc-%{version}_en.jar
-ln -s fedora-nmclf-1.0.jar fedora-nmclf-%{version}.jar
-ln -s fedora-nmclf-1.0_en.jar fedora-nmclf-%{version}_en.jar
+ln -s fedora-base-%{version}.jar fedora-base-1.0.jar
+ln -s fedora-mcc-%{version}.jar fedora-mcc-1.0.jar
+ln -s fedora-mcc-%{version}_en.jar fedora-mcc-1.0_en.jar
+ln -s fedora-nmclf-%{version}.jar fedora-nmclf-1.0.jar
+ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf-1.0_en.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT