rpms/pki-java-tools/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 pki-java-tools.spec, 1.1, 1.2 sources, 1.2, 1.3

[kwright]

Author: kwright

Update of /cvs/pkgs/rpms/pki-java-tools/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6134/EL-5

Modified Files:
	.cvsignore import.log pki-java-tools.spec sources 
Log Message:
dogtag build for 562986 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-java-tools/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Jan 2010 05:08:20 -0000	1.2
+++ .cvsignore	16 Feb 2010 20:28:40 -0000	1.3
@@ -1 +1 @@
-pki-java-tools-1.3.0.tar.gz
+pki-java-tools-1.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pki-java-tools/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Jan 2010 05:08:20 -0000	1.1
+++ import.log	16 Feb 2010 20:28:41 -0000	1.2
@@ -1 +1,2 @@
 pki-java-tools-1_3_0-4_el5_1:EL-5:pki-java-tools-1.3.0-4.el5.1.src.rpm:1262667963
+pki-java-tools-1_3_1-1_el5:EL-5:pki-java-tools-1.3.1-1.el5.src.rpm:1266352074


Index: pki-java-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pki-java-tools/EL-5/pki-java-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pki-java-tools.spec	5 Jan 2010 05:08:20 -0000	1.1
+++ pki-java-tools.spec	16 Feb 2010 20:28:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pki-java-tools
-Version:        1.3.0
-Release:        4%{?dist}.1
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Dogtag Certificate System - PKI Java-Based Tools
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -21,11 +21,6 @@ Requires:       java >= 1:1.6.0
 Requires:       pki-native-tools
 Requires:       pki-util
 
-%if 0%{?rhel}
-#rhel has no java on ppc
-ExcludeArch:    ppc
-%endif
-
 Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
 
 %description
@@ -63,10 +58,17 @@ rm -rf %{buildroot}
 cd dist/binary
 unzip %{name}-%{version}.zip -d %{buildroot}
 cd %{buildroot}%{_javadir}
-mv cstools.jar cstools-%{version}.jar
-ln -s cstools-%{version}.jar cstools.jar
+mv pkitools.jar pkitools-%{version}.jar
+ln -s pkitools-%{version}.jar pkitools.jar
 rm -rf %{buildroot}%{_datadir}/pki
 
+# supply convenience symlink(s) for backwards compatibility
+mkdir -p %{buildroot}%{_javadir}/pki
+cd %{buildroot}%{_javadir}/pki
+ln -s ../pkitools.jar cstools.jar
+cd %{buildroot}%{_javadir}
+ln -s pkitools.jar cstools.jar
+
 %clean
 rm -rf %{buildroot}
 
@@ -81,8 +83,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}/
 
 %changelog
-* Mon Jan 4 2010 Kevin Wright <kwright at redhat.com> 1.3.0-4.1
-- no java on rhel ppc
+* Mon Feb 8 2010 Matthew Harmsen <mharmsen at redhat.com> 1.3.1-1
+- Bugzilla Bug #562986 -  Supply convenience symlink(s) for backwards
+  compatibility (rename jar files as appropriate)
 
 * Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-4
 - Removed 'with exceptions' from License


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-java-tools/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Jan 2010 05:08:20 -0000	1.2
+++ sources	16 Feb 2010 20:28:41 -0000	1.3
@@ -1 +1 @@
-b3c8552f4d9f24729fdfa347c489e2f6  pki-java-tools-1.3.0.tar.gz
+364a8f94fc5ac9709c41659065ffa4c6  pki-java-tools-1.3.1.tar.gz