[xmldb-api] Drop gcj.

[Alexander Kurtakov]

commit 1322014e5a87d84845dbb1f924a18639e41b08bb
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Dec 30 11:52:45 2010 +0200

    Drop gcj.
    
    No more versioned jars.
    Adapt to current guidelines.

 xmldb-api.spec |   62 ++++++++++---------------------------------------------
 1 files changed, 12 insertions(+), 50 deletions(-)
---
diff --git a/xmldb-api.spec b/xmldb-api.spec
index 7ad836d..a7d7415 100644
--- a/xmldb-api.spec
+++ b/xmldb-api.spec
@@ -28,15 +28,12 @@
 # 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 bname        xmldb
-%define cvs_version    20011111cvs
+%global bname        xmldb
+%global cvs_version    20011111cvs
 
 Name:       xmldb-api
 Version:    0.1
-Release:    0.4.%{cvs_version}.1.3%{?dist}
+Release:    0.4.%{cvs_version}.2%{?dist}
 Epoch:      1
 Summary:    XML:DB API for Java
 License:    BSD
@@ -47,7 +44,7 @@ Source:     xmldb-xapi-%{cvs_version}-src.tar.gz
 Source1:    %{name}-build.xml
 Source2:    %{name}-license.txt
 Patch0:     %{name}-syntaxfix.patch
-Url:        http://xmldb-org.sourceforge.net
+URL:        http://xmldb-org.sourceforge.net
 BuildRequires:    ant >= 0:1.6
 BuildRequires:    jpackage-utils >= 0:1.6
 BuildRequires:    junit
@@ -56,15 +53,7 @@ Requires(pre):    jpackage-utils >= 0:1.6
 Requires(post):   jpackage-utils >= 0:1.6
 Requires:         junit
 Requires:         xalan-j2
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The API interfaces are what driver developers must implement when creating a
@@ -98,6 +87,7 @@ currently to be useful.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -122,9 +112,8 @@ rm -rf %{buildroot}
 
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-install -m 644 dist/%{name}-sdk.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-sdk-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
+install -m 644 dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 dist/%{name}-sdk.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-sdk.jar
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -134,46 +123,14 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
 cp %{SOURCE2} $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
-%clean
-rm -rf %{buildroot}
-
-%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)
 %doc %{_docdir}/%{name}-%{version}
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
 
 %files sdk
 %defattr(-,root,root)
-%{_javadir}/%{name}-sdk-%{version}.jar
 %{_javadir}/%{name}-sdk.jar
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-sdk-%{version}.jar.*
-%endif
 
 %files javadoc
 %defattr(-,root,root)
@@ -181,6 +138,11 @@ fi
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 30 2010 Alexander Kurtakov <akurtako at redhat.com> 1:0.1-0.4.20011111cvs.2
+- Drop gcj.
+- No more versioned jars.
+- Adapt to current guidelines.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.1-0.4.20011111cvs.1.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild