From dc6cf84c3cccf673ea6bf1c0b7b48a4e3f763494 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Mar 05 2010 10:09:04 +0000 Subject: Drop gcj_support. --- diff --git a/swing-layout.spec b/swing-layout.spec index c22c10b..61f7299 100644 --- a/swing-layout.spec +++ b/swing-layout.spec @@ -1,9 +1,6 @@ -# Use rpmbuild --without gcj to disable gcj bits -%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} - Name: swing-layout Version: 1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Natural layout for Swing panels Group: Development/Libraries @@ -19,19 +16,11 @@ BuildRequires: ant BuildRequires: dos2unix Requires: java >= 1.3 -%if %{with_gcj} -BuildRequires: java-gcj-compat-devel >= 1.0.31 -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 -%else BuildArch: noarch -%endif - %description Extensions to Swing to create professional cross platform layout. - %package javadoc Summary: Javadoc documentation for Swing Layout Group: Documentation @@ -57,39 +46,12 @@ install -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir} ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -%if %{with_gcj} -%{_bindir}/aot-compile-rpm -%endif - - %clean rm -rf $RPM_BUILD_ROOT - -%post -%if %{with_gcj} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - - -%postun -%if %{with_gcj} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - - %files %defattr(-,root,root) %{_javadir}/%{name}*.jar -%if %{with_gcj} -%{_libdir}/gcj/%{name} -%endif %doc releaseNotes.txt @@ -99,6 +61,9 @@ fi %changelog +* Fri Mar 5 2010 Alexander Kurtakov 1.0.4-2 +- Drop gcj_support. + * Tue Jan 26 2010 Victor G. Vasilyev - 1.0.4-1 - 1.0.4