diff --git a/.cvsignore b/.cvsignore index dc38bf1..b592817 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -swing-layout-1.0.3-src.zip +swing-layout-1.0.4-src.zip diff --git a/import.log b/import.log new file mode 100644 index 0000000..06fe4db --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +swing-layout-1_0_4-2_fc14:EL-6:swing-layout-1.0.4-2.fc14.src.rpm:1278978257 diff --git a/sources b/sources index 8f3ee48..15937e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53952994e770f02446b3d391ed2d4f4f swing-layout-1.0.3-src.zip +dddf900113dfd94658d0d0504cb78a8c swing-layout-1.0.4-src.zip diff --git a/swing-layout.spec b/swing-layout.spec index 46869b1..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.3 -Release: 4%{?dist} +Version: 1.0.4 +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,12 @@ 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 + * Sun Jul 26 2009 Fedora Release Engineering - 1.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild