rpms/directory-naming/devel directory-naming.spec,1.1,1.2

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/directory-naming/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25271/devel

Modified Files:
	directory-naming.spec 
Log Message:
- Remove gcj support.
- Build with build.sysclasspath=only.



Index: directory-naming.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directory-naming/devel/directory-naming.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- directory-naming.spec	19 Aug 2009 13:22:17 -0000	1.1
+++ directory-naming.spec	19 Aug 2009 14:02:42 -0000	1.2
@@ -28,11 +28,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 Name:           directory-naming
 Version:        0.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Directory Naming
 License:        ASL 2.0
@@ -79,17 +77,9 @@ Requires:  mx4j
 Requires(post):    jpackage-utils >= 0:1.7.3
 Requires(postun):  jpackage-utils >= 0:1.7.3
 
-%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
 Old directory/naming module.
 
@@ -103,7 +93,7 @@ Requires(postun): /bin/rm
 %{summary}.
 
 %prep
-%setup -q 
+%setup -q
 # remove all binary libs
 for j in $(find . -name "*.jar"); do
     mv $j $j.no
@@ -147,8 +137,7 @@ done;
 
 export OPT_JAR_LIST="junit ant/ant-junit"
 
-#ant -Dbuild.sysclasspath=only jar javadoc
-ant jar javadoc
+ant -Dbuild.sysclasspath=only jar javadoc
 
 %install
 rm -rf %{buildroot}
@@ -185,42 +174,27 @@ done
 %__mkdir_p %{buildroot}%{_docdir}/%{name}-%{version}
 %__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)
-%{_docdir}/%{name}-%{version}/LICENSE.txt 
+%{_docdir}/%{name}-%{version}/LICENSE.txt
 %{_javadir}/%{name}
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
 
 %changelog
+* Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:0.8-5
+- Remove gcj support.
+- Build with build.sysclasspath=only.
+
 * Sun May 17 2009 Fernando Nasser <fnasser at redhat.com> - 0.8-4
 - Fix license
 
@@ -235,4 +209,3 @@ fi
 
 * Fri Nov 30 2007 Ralph Apel <r.apel at r-apel.de> 0:0.8-1jpp
 - First release
-