SPECS: jpackage-utils.spec - macros.java dropped (rpm-build-macros...

[glen]

Author: glen                         Date: Tue May 23 20:16:41 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- macros.java dropped (rpm-build-macros >= 1.300 provide them)

---- Files affected:
SPECS:
   jpackage-utils.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/jpackage-utils.spec
diff -u SPECS/jpackage-utils.spec:1.7 SPECS/jpackage-utils.spec:1.8
--- SPECS/jpackage-utils.spec:1.7	Mon May 22 00:47:01 2006
+++ SPECS/jpackage-utils.spec	Tue May 23 22:16:32 2006
@@ -4,22 +4,19 @@
 Summary(pl):	Narzędzia JPackage
 Name:		jpackage-utils
 Version:	1.6.6
-Release:	3.1
+Release:	3.2
 Epoch:		0
 License:	BSD-like
 Group:		Development/Languages/Java
 Source0:	%{name}-%{version}.tar.bz2
 # Source0-md5:	85336e72018ecefa2f9999fc4e6f3eb8
 Patch0:		%{name}-pdksh.patch
-Patch1:		%{name}-rpm_macros_ignore_env.patch
 URL:		http://www.jpackage.org/
 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/>:
 
@@ -80,7 +77,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 echo "JPackage release %{jpackage_distver} (PLD Linux port) for %{buildarch}" > etc/jpackage-release
@@ -97,7 +93,7 @@
 done
 
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/java,${_jvmdir}} \
-	$RPM_BUILD_ROOT{%{_rpmlibdir},/etc/env.d,${_jvmdir},${_javadocdir}} \
+	$RPM_BUILD_ROOT{/etc/env.d,${_jvmdir},${_javadocdir}} \
 	$RPM_BUILD_ROOT{${_jvmjardir},${_jvmprivdir},${_jvmlibdir},${_jvmdatadir}} \
 	$RPM_BUILD_ROOT{${_jvmsysconfdir},${_jvmcommonlibdir},${_jvmcommondatadir}} \
 	$RPM_BUILD_ROOT{${_jvmcommonsysconfdir},${_javadir},${_jnidir}} \
@@ -132,13 +128,6 @@
 install -pm 644 etc/java.conf $RPM_BUILD_ROOT%{_sysconfdir}/java
 install -pm 644 etc/jpackage-release $RPM_BUILD_ROOT%{_sysconfdir}/java
 install -pm 644 java-utils/* $RPM_BUILD_ROOT${_javadir}-utils
-awk 'BEGIN {cont=0}
-/^#/ { if (!cont) next }
-/^%%/ { if (cont) print; else print "%%define " substr($0,2) }
-{cont = $0 ~ /\\$/}
-/\\\\$/ { print $0 "\\"; next }
-$0 !~ /^%%/ {print}
-' misc/macros.jpackage > $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java
 
 cat <<EOF > %{name}-%{version}.files
 %dir ${_jvmdir}
@@ -175,16 +164,15 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/java/font.properties
 %config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/*
 
-%files -n rpm-javaprov
-%defattr(644,root,root,755)
-%{_rpmlibdir}/macros.java
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/05/23 20:16:32  glen
+- macros.java dropped (rpm-build-macros >= 1.300 provide them)
+
 Revision 1.7  2006/05/21 22:47:01  qboosh
 - pl, missing defattr
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jpackage-utils.spec?r1=1.7&r2=1.8&f=u