[xdoclet] Remove parts that are irrelevant to Fedora.

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Nov 29 09:17:44 UTC 2011 

commit 0efc05a7bee70da62d3a2840d4c441c06aa3ea43
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Tue Nov 29 10:55:36 2011 +0200

    Remove parts that are irrelevant to Fedora.
    
    Adapt to current guidelines.
    Drop demo - depending on struts which is no longer in the distro.

 xdoclet.spec |  205 ++++------------------------------------------------------
 1 files changed, 14 insertions(+), 191 deletions(-)
---
diff --git a/xdoclet.spec b/xdoclet.spec
index add89b2..c3c01c5 100644
--- a/xdoclet.spec
+++ b/xdoclet.spec
@@ -28,26 +28,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%define _without_maven 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}}}
-
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
-
-# FIXME: Fedora lacks webwork and xwork, needed for the demo
-%define _without_demo 1
-
-# If you do not want to build samples in demo subpackage because of their 
-# runtime deps, give rpmbuild option '--without demo'
-%define with_demo %{!?_without_demo:1}%{?_without_demo:0}
-
 Name:           xdoclet
 Version:        1.2.3
-Release:        12.4%{?dist}
+Release:        13%{?dist}
 Epoch:          0
 Summary:        XDoclet Attribute Orientated Programming Framework
 License:        BSD       
@@ -63,89 +46,36 @@ Patch4:         xdoclet-project_xml.patch
 Patch5:         xdoclet-AbstractProgramElementTagsHandler.patch
 Patch6:         xdoclet-build_docs_xml.patch
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
-BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  java-devel >= 0:1.4.2
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
-BuildRequires:  ant-nodeps >= 0:1.5
-BuildRequires:  ant-trax
-%if %{with_maven}
-BuildRequires:  maven >= 0:1.1
-%endif
 BuildRequires:  junit
 BuildRequires:  javacc
 BuildRequires:  jrefactory
 BuildRequires:  bsf 
-BuildRequires:  jakarta-commons-collections 
-BuildRequires:  jakarta-commons-lang 
-BuildRequires:  jakarta-commons-logging 
-BuildRequires:  jakarta-commons-net 
+BuildRequires:  apache-commons-collections 
+BuildRequires:  apache-commons-lang 
+BuildRequires:  apache-commons-logging 
+BuildRequires:  apache-commons-net 
 BuildRequires:  log4j
-BuildRequires:  struts 
 BuildRequires:  velocity 
 BuildRequires:  xalan-j2 >= 0:2.7.0
 BuildRequires:  xml-commons-apis 
 BuildRequires:  xjavadoc >= 0:1.1
 
 Requires:  bsf
-Requires:  jakarta-commons-collections
-Requires:  jakarta-commons-logging
+Requires:  apache-commons-collections
+Requires:  apache-commons-logging
 Requires:  log4j
 Requires:  velocity
 Requires:  xalan-j2 >= 0:2.7.0
 Requires:  xml-commons-apis
 Requires:  xjavadoc = 0:1.1
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description
 This package contains the XDoclet Attribute Orientated Programming Framework
 
-%if %{with_demo}
-%package demo
-Summary:        XDoclet Sample Projects
-Group:          Development/Framework
-BuildRequires:  servletapi4
-BuildRequires:  struts
-BuildRequires:  velocity
-BuildRequires:  webwork >= 0:2.1
-BuildRequires:  xwork
-BuildRequires:  geronimo-ejb-2.1-api
-BuildRequires:  myfaces
-BuildRequires:  geronimo-jms-1.1-api
-BuildRequires:  mx4j
-Requires:  %{name} = %{version}-%{release}
-Requires:  geronimo-ejb-2.1-api
-Requires:  myfaces
-Requires:  geronimo-jms-1.1-api
-Requires:  webwork
-Requires:  xwork
-Requires:  mx4j
-Requires:  struts
-Requires:  servletapi4
-
-%description demo
-This package contains sample XDoclet projects.
-%endif
-
-%if %{with_maven}
-%package maven-plugin
-Summary:        XDoclet Maven Plugin
-Group:          Development/Framework
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       maven >= 0:1.1
-
-%description maven-plugin
-%{summary}.
-%endif
-
 %package javadoc
 Summary:        XDoclet Javadoc
 Group:          Development/Documentation
@@ -166,12 +96,6 @@ This package contains XDoclet documentation.
 find . -name "*.jar" -exec rm {} \;
 find . -name "*.class" -exec rm {} \;
 
-# Replace JOnAS specific tasks with code blessed by ObjectWeb
-#pushd modules
-#mv objectweb objectweb.orig
-#tar xzf %{SOURCE1}
-#popd
-
 # Remove mockobjects support.
 rm -rf modules/mockobjects
 
@@ -179,16 +103,6 @@ for j in xjavadoc-1.1 jrefactory javacc junit bsf commons-collections commons-lo
         ln -s $(build-classpath $j) lib
 done
 
-%if %{with_demo}
-for j in servletapi4 struts velocity webwork-migration xwork geronimo-ejb-2.1-api myfaces/myfaces-jsf-api geronimo-jms-1.1-api; do
-        ln -s $(build-classpath $j) samples/lib
-done
-for j in mx4j/mx4j-jmx mx4j/mx4j-tools; do
-        i=$(build-classpath $j)
-        ln -s $(build-classpath $j) samples/lib
-done
-%endif
-
 %patch0 -b .sav
 %patch1 -b .sav
 %patch2 -b .sav 
@@ -198,33 +112,15 @@ done
 %patch6 -b .sav
 
 %build
-export MAVEN_HOME=/usr/share/maven
-export MAVEN_LOCAL_HOME=$(pwd)/.maven
-%if %{with_maven}
-ant -Dbuild.sysclasspath=first core modules maven docs l10n
-%else
 ant -Dbuild.sysclasspath=first core modules docs l10n
-%endif
-%if %{with_demo}
-ant samples
-%endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -m 644 target/lib/xdoclet*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
-%if %{with_maven}
-install -m 644 target/lib/maven-xdoclet*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
-%endif
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
-%if %{with_demo}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-cp -pr samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-%endif
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf target/docs/api
 
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -232,96 +128,24 @@ cp -p LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm 
-%endif
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
-%defattr(-, root, root, -)
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}/%{name}*.jar
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
 
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-apache-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-bea-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-borland-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-caucho-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-ejb-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-exolab-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-hibernate-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-hp-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-ibm-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-java-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jboss-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jdo-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jmx-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jsf-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-libelis-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-macromedia-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-mvcsoft-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-mx4j-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-objectweb-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-openejb-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-oracle-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-orion-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-portlet-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-pramati-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-solarmetric-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-spring-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-sun-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-sybase-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-tjdo-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-web-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-webwork-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-wsee-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-xdoclet-module-1.2.3.jar.*
-%endif
-
-%if %{with_maven}
-%files maven-plugin
-%defattr(-, root, root, -)
-%{_javadir}/%{name}/maven-%{name}*.jar
-%endif
-
-%if %{with_demo}
-%files demo
-%defattr(-, root, root, -)
-%{_datadir}/%{name}-%{version}
-%endif
-
 %files javadoc
-%defattr(-, root, root, -)
-%doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
 %files manual
-%defattr(-, root, root, -)
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Tue Nov 29 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.2.3-13
+- Remove parts that are irrelevant to Fedora.
+- Adapt to current guidelines.
+- Drop demo - depending on struts which is no longer in the distro.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2.3-12.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -431,4 +255,3 @@ fi
 
 * Fri Mar 05 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
 - First JPackage release.
-

More information about the scm-commits mailing list