Author: shadzik Date: Wed May 3 22:29:25 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - added BRs; some build fixes, builds now
---- Files affected: SPECS: fedora-console.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/fedora-console.spec diff -u SPECS/fedora-console.spec:1.2 SPECS/fedora-console.spec:1.3 --- SPECS/fedora-console.spec:1.2 Wed May 3 18:07:41 2006 +++ SPECS/fedora-console.spec Thu May 4 00:29:20 2006 @@ -7,11 +7,12 @@ 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 URL: http://directory.fedora.redhat.com/wiki/Client_software +BuildRequires: jakarta-ant >= 1.6 #BuildRequires: jss >= 3.6 -#BuildRequires: ldapjdk >= 4.17 -#Requires: jss >= 3.6 -#Requires: ldapjdk >= 4.17 +BuildRequires: ldapsdk >= 4.17 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -20,23 +21,24 @@ %prep %setup -q +install %{SOURCE1} ./jss3.jar %build -ant +ant -Djss.local.location=. %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 console/startconsole $RPM_BUILD_ROOT/%{_bindir} +install startconsole $RPM_BUILD_ROOT/%{_bindir} cd $RPM_BUILD_ROOT%{_datadir}/%{name} -ln -s fedora-base-%{version}.jar fedora-base.jar -ln -s fedora-mcc-%{version}.jar fedora-mcc.jar -ln -s fedora-mcc-%{version}_en.jar fedora-mcc_en.jar -ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar -ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar +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 %clean rm -rf $RPM_BUILD_ROOT @@ -48,11 +50,11 @@ %{_datadir}/%{name}/fedora-mcc-%{version}_en.jar %{_datadir}/%{name}/fedora-nmclf-%{version}.jar %{_datadir}/%{name}/fedora-nmclf-%{version}_en.jar -%{_datadir}/%{name}/fedora-base.jar -%{_datadir}/%{name}/fedora-mcc.jar -%{_datadir}/%{name}/fedora-mcc_en.jar -%{_datadir}/%{name}/fedora-nmclf.jar -%{_datadir}/%{name}/fedora-nmclf_en.jar +%{_datadir}/%{name}/fedora-base-1.0.jar +%{_datadir}/%{name}/fedora-mcc-1.0.jar +%{_datadir}/%{name}/fedora-mcc-1.0_en.jar +%{_datadir}/%{name}/fedora-nmclf-1.0.jar +%{_datadir}/%{name}/fedora-nmclf-1.0_en.jar %attr(755,root,root) %{_bindir}/startconsole %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -61,6 +63,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2006/05/03 22:29:20 shadzik +- added BRs; some build fixes, builds now + Revision 1.2 2006/05/03 16:07:41 glen - junk cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fedora-console.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
