rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec, 1.31, 1.32

[fedora-cvs-commits at redhat.com]

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2703

Modified Files:
	jakarta-commons-modeler.spec 
Log Message:
Merged with upstream version



Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jakarta-commons-modeler.spec	18 Jul 2006 00:03:59 -0000	1.31
+++ jakarta-commons-modeler.spec	19 Jul 2006 22:15:00 -0000	1.32
@@ -34,14 +34,11 @@
 
 %define base_name	modeler
 %define short_name	commons-%{base_name}
-%define name		jakarta-%{short_name}
-%define version		1.1
-%define release		6jpp_1fc
 %define	section		free
 
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Name:		jakarta-%{short_name}
+Version:	1.1
+Release:	7jpp_1fc
 Epoch:		0
 Summary:	Jakarta Commons Modeler Package
 License:	Apache Software License
@@ -162,9 +159,14 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
-* Mon Jul 17 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-6jpp_1fc
+* Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-7jpp_1fc
+- Merged with upstream version
+
+* Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-7jpp
+- Removed separate definition of name, version and release
+
+* Mon Jul 17 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-6jpp
 - Added contional native compilation.
-- Merge with upstream version.
 
 * Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.1-5jpp
 - First JPP 1.7 build