rpms/plexus-ant-factory/devel plexus-ant-factory.spec, 1.14, 1.15 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-ant-factory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4731/devel

Modified Files:
	plexus-ant-factory.spec .cvsignore sources 
Log Message:
- Update to 1.0 alpha 2.1.
- Drop gcj_support.


Index: plexus-ant-factory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-ant-factory/devel/plexus-ant-factory.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- plexus-ant-factory.spec	26 Jul 2009 18:53:28 -0000	1.14
+++ plexus-ant-factory.spec	22 Dec 2009 22:30:07 -0000	1.15
@@ -28,11 +28,6 @@
 # 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 with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
@@ -41,26 +36,23 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.4.a1.1.11%{?dist}
+Release:        0.4.a2.1.1%{?dist}
 Epoch:          0
 Summary:        Plexus Ant component factory
 # Email from copyright holder confirms license.
 License:        ASL 2.0
 Group:          Development/Java
 URL:            http://plexus.codehaus.org/
-Source0:        %{name}-src.tar.gz
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/
-#            plexus-ant-factory-1.0-alpha-1 plexus-ant-factory/
-# tar czf plexus-ant-factory-src.tar.gz plexus-ant-factory/
+Source0:        %{name}-src.tar.bz2
+# svn export http://svn.codehaus.org/plexus/tags/plexus-ant-factory-1.0-alpha-2.1/ plexus-ant-factory/
+# tar cjf plexus-ant-factory-src.tar.bz2 plexus-ant-factory/
 Source1:        %{name}-jpp-depmap.xml
 Source2:        %{name}-build.xml
 Source3:	plexus-ant-factory_license_and_copyright.txt
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
 %if %{with_maven}
@@ -69,9 +61,9 @@ BuildRequires:    maven2-plugin-compiler
 BuildRequires:    maven2-plugin-install
 BuildRequires:    maven2-plugin-jar
 BuildRequires:    maven2-plugin-javadoc
-BuildRequires:    maven2-plugin-release
 BuildRequires:    maven2-plugin-resources
-BuildRequires:    maven2-plugin-surefire
+BuildRequires:    maven-surefire-maven-plugin
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    maven2-common-poms >= 1.0-2
 %endif
 BuildRequires:    ant
@@ -87,12 +79,6 @@ Requires:    plexus-utils
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description
 Ant component class creator for Plexus.
 
@@ -168,29 +154,13 @@ install -pm 644 pom.xml \
                 $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 %endif
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
 %postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
 %files
@@ -201,11 +171,6 @@ fi
 %{_datadir}/maven2
 %{_mavendepmapfragdir}
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-factory-1.0.jar.*
-%endif
-
 %if %{with_maven}
 %files javadoc
 %defattr(-,root,root,-)
@@ -214,6 +179,10 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a2.1.1
+- Update to 1.0 alpha 2.1.
+- Drop gcj_support.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.4.a1.1.11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-ant-factory/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 23:06:24 -0000	1.2
+++ .cvsignore	22 Dec 2009 22:30:07 -0000	1.3
@@ -1 +1,2 @@
 plexus-ant-factory-src.tar.gz
+plexus-ant-factory-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-ant-factory/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2007 23:06:24 -0000	1.2
+++ sources	22 Dec 2009 22:30:07 -0000	1.3
@@ -1 +1 @@
-c344afdd8e8994e3061c3158eaee61bc  plexus-ant-factory-src.tar.gz
+d2562161a88911ba4333aadc0cae451a  plexus-ant-factory-src.tar.bz2