rpms/plexus-cdc/devel plexus-cdc.spec,1.11,1.12 sources,1.1,1.2

Andrew Overholt overholt at fedoraproject.org
Thu Aug 20 19:39:17 UTC 2009


Author: overholt

Update of /cvs/pkgs/rpms/plexus-cdc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10137

Modified Files:
	plexus-cdc.spec sources 
Log Message:
* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.a10.1.1
- Update to alpha 10 (courtesy Deepak Bhole)
- Remove gcj support


Index: plexus-cdc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cdc/devel/plexus-cdc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- plexus-cdc.spec	26 Jul 2009 18:54:33 -0000	1.11
+++ plexus-cdc.spec	20 Aug 2009 19:39:17 -0000	1.12
@@ -28,12 +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 parent plexus
 
 %define subname cdc
@@ -42,22 +36,22 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.4.a4.1.7%{?dist}
+Release:        0.5.a10.1.1%{?dist}
 Epoch:          0
 Summary:        Plexus Component Descriptor Creator
 License:        MIT
 Group:          Development/Java
 URL:            http://plexus.codehaus.org/
-Source0:        %{name}-src.tar.gz
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-cdc-1.0-alpha-4 plexus-cdc/
-# tar czf plexus-cdc-1.0-alpha-4.tar.gz plexus-cdc/
-Source1:		%{name}-jpp-depmap.xml
+# svn export \
+#  http://svn.codehaus.org/plexus/archive/plexus-tools/tags/plexus-cdc-1.0-alpha-10/ \
+#  plexus-cdc/
+# tar czf plexus-cdc-1.0-alpha-10.tar.gz plexus-cdc/
+Source0:        %{name}-1.0-alpha-10.tar.gz
+Source1:	%{name}-jpp-depmap.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:	maven2 >= 2.0.4-9
@@ -65,7 +59,6 @@ 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:	maven2-common-poms >= 1.0
@@ -82,12 +75,6 @@ Requires:		qdox
 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
 The Plexus project seeks to create end-to-end developer tools for
 writing applications. At the core is the container, which can be
@@ -144,34 +131,15 @@ cp -pr target/site/apidocs/* \
 
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %postun
 %update_maven_depmap
 
-
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/plexus
@@ -179,17 +147,15 @@ fi
 %{_mavendepmapfragdir}
 %config(noreplace) /etc/maven/fragments/plexus-cdc
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cdc-1.0.jar.*
-%endif
-
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
-
 %changelog
+* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.a10.1.1
+- Update to alpha 10 (courtesy Deepak Bhole)
+- Remove gcj support
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.4.a4.1.7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cdc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Mar 2007 22:21:32 -0000	1.1
+++ sources	20 Aug 2009 19:39:17 -0000	1.2
@@ -1 +1 @@
-c6917575b249874e088dbd6a6aca03df  plexus-cdc-src.tar.gz
+715e99df384a0037b2cd5bb107c7be21  plexus-cdc-1.0-alpha-10.tar.gz




More information about the fedora-extras-commits mailing list