rpms/mockobjects/devel mockobjects-AssertMo.patch, NONE, 1.1 mockobjects.spec, 1.10, 1.11

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Jul 21 20:18:34 UTC 2006 

Author: mwringe

Update of /cvs/dist/rpms/mockobjects/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31185

Modified Files:
	mockobjects.spec 
Added Files:
	mockobjects-AssertMo.patch 
Log Message:
Merge with upstream version
Natively compile packages


mockobjects-AssertMo.patch:
 AssertMo.java |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mockobjects-AssertMo.patch ---
--- src/core/com/mockobjects/util/AssertMo.java.sav	2006-05-05 17:49:14.000000000 +0200
+++ src/core/com/mockobjects/util/AssertMo.java	2006-05-05 17:49:46.000000000 +0200
@@ -77,7 +77,7 @@
         assertTrue("Should not have verified", threwException);
     }
 
-    static protected void failNotEquals(
+    public static void failNotEquals(
         String message,
         Object expected,
         Object actual) {


Index: mockobjects.spec
===================================================================
RCS file: /cvs/dist/rpms/mockobjects/devel/mockobjects.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mockobjects.spec	12 Jul 2006 07:22:24 -0000	1.10
+++ mockobjects.spec	21 Jul 2006 20:18:32 -0000	1.11
@@ -1,21 +1,53 @@
-%define name		mockobjects
-%define version		0.09
-%define release 	12jpp_5fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%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 section		free
 %define j2ee12  %{?_with_j2ee12:1}%{!?_without_j2ee12:0}
 %define j2ee13  %{?_with_j2ee13:1}%{!?_without_j2ee13:0}
 
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
+Name:		mockobjects
+Version:	0.09
+Release:	14jpp_1fc
 Epoch:		0
 Summary:	Java MockObjects package
 License:	BSD Style
 URL:		http://www.mockobjects.com/
 Group:		Development/Testing
-Source0:	%{name}-%{version}-RHCLEAN.tar.bz2
+Source0:	http://www.mockobjects.com/dist/%{name}-%{version}-RHCLEAN.tar.bz2
 Patch0:		%{name}-buildjdk.patch
 Patch1:		%{name}-ext-httpmethod-abstract.patch
+Patch2:		%{name}-AssertMo.patch
 Requires:	junit
 Requires:	/usr/sbin/update-alternatives
 BuildRequires:	ant >= 1.6.1
@@ -30,9 +62,17 @@
 %if %{j2ee13}
 BuildRequires:	j2sdkee-1.3-sun
 %endif
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 The Mock Objects project is a generic unit testing framework whose goal
 is to facilitate developing unit tests in the mock object style. The
@@ -50,6 +90,12 @@
 Requires:	java-devel >= 1.4
 Requires:	java-devel < 1.5
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description jdk1.4
 MockObjects specific to JDK 1.4.x
 
@@ -60,6 +106,12 @@
 Requires:	/usr/sbin/update-alternatives
 Requires:	jakarta-commons-httpclient
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description httpclient
 MockObjects for Jakarta Commons HttpClient
 
@@ -71,6 +123,12 @@
 Requires:	%{name}-httpclient = %{epoch}:%{version}-%{release}
 Requires:	jakarta-commons-httpclient
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description alt-httpclient
 Alternative API for Jakarta Commons HttpClient to allow for testing
 
@@ -82,6 +140,12 @@
 Requires:	java-devel >= 1.4
 Requires:	java-devel < 1.5
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description alt-jdk1.4
 Alternative API for JDK 1.4 to allow for testing
 
@@ -93,6 +157,12 @@
 Requires:	java-devel >= 1.4
 Requires:	java-devel < 1.5
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description jdk1.4-j2ee1.2
 API for JDK 1.4 to allow testing with J2EE 1.2 mocks
 
@@ -104,6 +174,12 @@
 Requires:	java-devel >= 1.4
 Requires:	java-devel < 1.5
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description jdk1.4-j2ee1.3
 API for JDK 1.4 to allow testing with J2EE 1.3 mocks
 
@@ -111,8 +187,7 @@
 %setup -q -n %{name}-%{version}
 %patch0
 %patch1 -p1
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+%patch2
 
 %build
 
@@ -206,14 +281,102 @@
     popd
 done
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
+%post jdk1.4
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun jdk1.4
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post httpclient
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun httpclient
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post alt-httpclient
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun alt-httpclient
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post alt-jdk1.4
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun alt-jdk1.4
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc doc/README
 %{_javadir}/%{name}-core*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-core-0.09.jar.*
+%endif
+
 %files jdk1.4
 %defattr(0644,root,root,0755)
 %{_javadir}-ext/%{name}-jdk1.4/%{name}-%{version}.jar
@@ -225,10 +388,18 @@
 %{_javadir}-1.4.2/%{name}-%{version}.jar
 %{_javadir}-1.4.2/%{name}.jar
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-0.09.jar.*
+%endif
+
 %files httpclient
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-httpclient*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-httpclient-0.09.jar.*
+%endif
+
 %files alt-jdk1.4
 %defattr(0644,root,root,0755)
 %{_javadir}-ext/%{name}-alt-jdk1.4/*
@@ -239,11 +410,19 @@
 %{_javadir}-1.4.2/%{name}-alt-%{version}.jar
 %{_javadir}-1.4.2/%{name}-alt.jar
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-alt-0.09.jar.*
+%endif
+
 %files alt-httpclient
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-alt-httpclient*
 
 %if %{j2ee12}
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-alt-httpclient-0.09.jar.*
+%endif
+
 %files jdk1.4-j2ee1.2
 %defattr(0644,root,root,0755)
 %{_javadir}-ext/%{name}-jdk1.4/%{name}-j2ee1.2-%{version}.jar
@@ -257,6 +436,10 @@
 %endif
 
 %if %{j2ee13}
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-alt-httpclient-0.09.jar.*
+%endif
+
 %files jdk1.4-j2ee1.3
 %defattr(0644,root,root,0755)
 %{_javadir}-ext/%{name}-jdk1.4/%{name}-j2ee1.3-%{version}.jar
@@ -269,28 +452,24 @@
 %{_javadir}-1.4.2/%{name}-j2ee1.3.jar
 %endif
 
-%changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.09-12jpp_5fc
-- rebuild
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:09-11jpp_4fc
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> 0:09-11jpp_3fc
-- rebuilt
-
-* Thu Sep 08 2005 Florian La Roche <laroche at redhat.com>
-- remove empty post/postun scripts
-- remove unneeded provides
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-alt-httpclient-0.09.jar.*
+%endif
 
-* Wed Jun 22 2005 Gary Benson <gbenson at redhat.com> 0.09-11jpp_2fc
-- Remove jarfile from the tarball.
+%changelog
+* Fri Jul 21 2006 Matt Wringe <mwringe at redhat.com> 0.09-14jpp_1fc
+- Merge with upstream version
+- Natively compile packages
+
+* Fri Jul 21 2006 Matt Wringe <mwringe at redhat.com> 0.09-14jpp
+- Add conditional native compiling
+- Remove unnecessary provides and empty %pre and %post section
 
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0.09-11jpp_1fc
-- Build into Fedora.
+* Fri Apr 28 2006 Fernando Nasser <fnasser at redhat.com> 0.09-13jpp
+- First JPP 1.7 build
 
-* Fri Oct 15 2004 Fernando Nasser <fnasser at redhat.com> 0.09-11jpp_1rh
-- First Red Hat build
+* Mon Dec 13 2004 Ralph Apel <r.apel at r-apel.de> 0.09-12jpp
+- Build j2ee mockobjects
 
 * Thu Sep 23 2004 Ralph Apel <r.apel at r-apel.de> 0.09-11jpp
 - Optionally activate j2ee mockobjects

More information about the fedora-cvs-commits mailing list