rpms/bcel/devel bcel.spec, 1.38, 1.39 bcel-5.1-project_xml.patch, 1.1, NONE bcel-5.1-build.patch, 1.1, NONE bcel-5.1-jpp-depmap.xml, 1.1, NONE

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/bcel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7824/devel

Modified Files:
	bcel.spec 
Removed Files:
	bcel-5.1-project_xml.patch bcel-5.1-build.patch 
	bcel-5.1-jpp-depmap.xml 
Log Message:
- Use global.
- Drop gcj_support.
- Fix groups.
- Fix build.


Index: bcel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- bcel.spec	24 Jul 2009 17:54:22 -0000	1.38
+++ bcel.spec	13 Jul 2010 08:14:26 -0000	1.39
@@ -28,22 +28,18 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-#For fedora, we want a native gcj compilation
-%define _with_gcj_support 1
 #Fedora currently does not support maven
-%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}}}
+%global _without_maven 1
 
 # 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}
+%global with_maven %{!?_without_maven:1}%{?_without_maven:0}
+%global without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
 Name:           bcel
 Version:        5.2
-Release:        7.1%{?dist}
+Release:        8%{?dist}
 Epoch:          0
 Summary:        Byte Code Engineering Library
 License:        ASL 2.0
@@ -61,7 +57,7 @@ Source7:        %{name}-%{version}.pom
 
 Patch0:         %{name}-%{version}-project_properties.patch
 URL:            http://jakarta.apache.org/%{name}/
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 Requires:       regexp
 BuildRequires:  ant
 %if %{with_maven}
@@ -83,6 +79,7 @@ Requires(postun):  jpackage-utils >= 0:1
 BuildRequires:  jdom
 BuildRequires:  velocity
 BuildRequires:  jakarta-commons-collections
+BuildRequires:  apache-commons-lang
 #excalibur-avalong-logkit should be used once Maven is supported in Fedora
 BuildRequires: avalon-logkit
 #BuildRequires:  excalibur-avalon-logkit
@@ -91,17 +88,9 @@ BuildRequires:  werken-xpath
 %endif
 BuildRequires:  regexp
 BuildRequires:  jpackage-utils >= 0:1.7.2
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{gcj_support}
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
 %description
 The Byte Code Engineering Library (formerly known as JavaClass) is
 intended to give users a convenient possibility to analyze, create, and
@@ -120,14 +109,14 @@ being the Xalan XSLT processor at Apache
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 
 %description javadoc
 %{summary}.
 
 %package manual
 Summary:        Manual for %{name}
-Group:          Development/Libraries/Java
+Group:          Documentation
 
 %description manual
 %{summary}.
@@ -153,6 +142,7 @@ pushd jakarta-site2/lib/
   build-jar-repository -s -p . jdom
   build-jar-repository -s -p . velocity
   build-jar-repository -s -p . commons-collections
+  build-jar-repository -s -p . commons-lang
   build-jar-repository -s -p . avalon-logkit
   build-jar-repository -s -p . werken-xpath
 popd
@@ -239,28 +229,14 @@ ant     -Dbuild.dest=build/classes -Dbui
 %endif
 %{__cp} LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 %{__rm} -rf %{buildroot}
 
 %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(0644,root,root,0755)
@@ -269,10 +245,6 @@ fi
 %{_javadir}/*
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*.jar.*
-%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -284,6 +256,12 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Tue Jul 13 2010 Alexander Kurtakov <akurtako at redhat.com> 0:5.2-8
+- Use global.
+- Drop gcj_support.
+- Fix groups.
+- Fix build.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:5.2-7.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- bcel-5.1-project_xml.patch DELETED ---


--- bcel-5.1-build.patch DELETED ---


--- bcel-5.1-jpp-depmap.xml DELETED ---