Author: glen Date: Sun May 21 20:20:21 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - create rpm-javaprov similiar to other languages
---- Files affected: SPECS: jpackage-utils.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/jpackage-utils.spec diff -u SPECS/jpackage-utils.spec:1.5 SPECS/jpackage-utils.spec:1.6 --- SPECS/jpackage-utils.spec:1.5 Sun May 21 20:02:44 2006 +++ SPECS/jpackage-utils.spec Sun May 21 22:20:16 2006 @@ -1,10 +1,9 @@ # $Revision$, $Date$ - %define jpackage_distver 1.6 Summary: JPackage utilities Name: jpackage-utils Version: 1.6.6 -Release: 3 +Release: 3.1 Epoch: 0 License: BSD-like URL: http://www.jpackage.org/ @@ -13,10 +12,12 @@ Patch0: %{name}-pdksh.patch Patch1: %{name}-rpm_macros_ignore_env.patch Group: Development/Languages/Java -BuildArch: noarch -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Requires: /bin/egrep Requires: /bin/sed +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _rpmlibdir /usr/lib/rpm %description Utilities from the JPackage Project <http://www.jpackage.org/>: @@ -36,11 +37,18 @@ - %{_sysconfdir}/java/jpackage-release string identifying the currently installed JPackage release - %{_sysconfdir}/java/java.conf system-wide Java configuration file -- %{_sysconfdir}/rpm/macros.jpackage RPM macros for Java packagers and - developers - %{_docdir}/%{name}-%{version}/jpackage-policy Java packaging policy for packagers and developers of JPackage Project +%package -n rpm-javaprov +Summary: RPM macros for java packages build +Group: Applications/File +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: rpm-build + +%description -n rpm-javaprov +RPM macros for building java packages. + %prep %setup -q %patch0 -p1 @@ -61,7 +69,7 @@ done install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/java,${_jvmdir}} \ - $RPM_BUILD_ROOT{/usr/lib/rpm,/etc/env.d,${_jvmdir},${_javadocdir}} \ + $RPM_BUILD_ROOT{%{_rpmlibdir},/etc/env.d,${_jvmdir},${_javadocdir}} \ $RPM_BUILD_ROOT{${_jvmjardir},${_jvmprivdir},${_jvmlibdir},${_jvmdatadir}} \ $RPM_BUILD_ROOT{${_jvmsysconfdir},${_jvmcommonlibdir},${_jvmcommondatadir}} \ $RPM_BUILD_ROOT{${_jvmcommonsysconfdir},${_javadir},${_jnidir}} \ @@ -103,7 +111,7 @@ {cont = $0 ~ /\\$/} /\\\\$/ { print $0 "\\"; next } $0 !~ /^%%/ {print} -' misc/macros.jpackage > $RPM_BUILD_ROOT/usr/lib/rpm/macros.java +' misc/macros.jpackage > $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java cat <<EOF > %{name}-%{version}.files %dir ${_jvmdir} @@ -139,7 +147,9 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/java/java.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/java/font.properties %attr(644,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/* -/usr/lib/rpm/macros.java + +%files -n rpm-javaprov +%{_rpmlibdir}/macros.java %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -147,6 +157,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2006/05/21 20:20:16 glen +- create rpm-javaprov similiar to other languages + Revision 1.5 2006/05/21 18:02:44 jajcus - ignore environment settings when evaluating %{java_home} and %{java} macros @@ -162,4 +175,3 @@ Revision 1.1 2006/05/19 13:43:47 jajcus - new spec - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jpackage-utils.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
