rpms/cryptix/devel cryptix.spec,1.7,1.8

[fedora-cvs-commits at redhat.com]

Author: mwringe

Update of /cvs/dist/rpms/cryptix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6065

Modified Files:
	cryptix.spec 
Log Message:
Merged with upstream version.



Index: cryptix.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptix/devel/cryptix.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cryptix.spec	19 Jul 2006 17:58:49 -0000	1.7
+++ cryptix.spec	19 Jul 2006 20:21:27 -0000	1.8
@@ -32,16 +32,13 @@
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define name		cryptix
-%define version		3.2.0
-%define release		7jpp_1fc
 %define snapshot	20001002
 
 %define section		free
 
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Name:		cryptix
+Version:	3.2.0
+Release:	8jpp_1fc
 Epoch:		0
 Summary:	Java crypto package
 License:	BSD style
@@ -134,8 +131,13 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 19 2006 Matt Weinge <mwringe at redhat.com> 3.2.0-8jpp_1rh
+- Merged with upstream verison.
+
+* Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> 3.2.0-8jpp
+- Removed separate definition of name, version, release
+
 * Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> 3.2.0-7jpp
-- Merged with upstream version
 - Added conditional native compiling
 
 * Tue Jul 18 2006 Fernando Nasser <fnasser at redhat.com> 3.2.0-6jpp