rpms/jpackage-utils/devel jpackage-utils.spec,1.31,1.32
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 1 20:00:45 UTC 2006
Author: fitzsim
Update of /cvs/dist/rpms/jpackage-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30504
Modified Files:
jpackage-utils.spec
Log Message:
- Make rebuild-security-providers rebuild
/usr/lib/security/classpath.security and
/usr/lib64/security/classpath.security. (204660)
Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jpackage-utils.spec 30 Aug 2006 17:46:14 -0000 1.31
+++ jpackage-utils.spec 1 Sep 2006 20:00:43 -0000 1.32
@@ -5,7 +5,7 @@
Name: jpackage-utils
Version: 1.6.6
-Release: 1jpp.7
+Release: 1jpp.8
Epoch: 0
Summary: JPackage utilities
License: JPackage License
@@ -21,6 +21,7 @@
AutoReqProv: no
BuildRequires: %{__awk}, %{__grep}
Requires: /bin/egrep, /bin/sed, /usr/bin/perl
+Requires: /bin/bash
%description
Utilities for the JPackage Project <http://www.jpackage.org/>:
@@ -98,23 +99,23 @@
%if %{gcj_support}
cat > bin/rebuild-security-providers << EOF
-#!/bin/sh
-# Rebuild the list of security providers classpath.security
+#!/bin/bash
+# Rebuild the list of security providers in classpath.security
-cat %{_libdir}/security/classpath.security \
- | grep -v "^security.provider." \
- > %{_libdir}/security/classpath.security.bak
-mv -f %{_libdir}/security/classpath.security.bak \
- %{_libdir}/security/classpath.security
-
-providers=\$(ls %{_sysconfdir}/java/security/security.d | sort \
- | awk -F- '{ print \$2 }')
-count=0
-for provider in \$providers
-do
- count=\$((count + 1))
- echo "security.provider."\$count"="\$provider \
- >> %{_libdir}/security/classpath.security
+secfiles="/usr/lib/security/classpath.security /usr/lib64/security/classpath.security"
+
+for secfile in \$secfiles; do
+ # check if this classpath.security file exists
+ [ -f "\$secfile" ] || continue
+
+ sed -i '/^security\.provider\./d' "\$secfile"
+
+ count=0
+ for provider in \$(ls /etc/java/security/security.d)
+ do
+ count=\$((count + 1))
+ echo "security.provider.\${count}=\${provider#*-}" >> "\$secfile"
+ done
done
EOF
%endif
@@ -208,6 +209,11 @@
%changelog
+* Fri Sep 1 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp.8
+- Make rebuild-security-providers rebuild
+ /usr/lib/security/classpath.security and
+ /usr/lib64/security/classpath.security. (204660)
+
* Wed Aug 30 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp.7
- Make rebuild-security-providers look in %{_libdir}.
More information about the fedora-cvs-commits
mailing list