[hamcrest] - Drop gcj support.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Oct 6 21:11:19 UTC 2010
commit 59b0ded8d54e8db6f3ae73e5f88969ddd136ec25
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Thu Oct 7 00:10:53 2010 +0300
- Drop gcj support.
hamcrest.spec | 41 ++++++++---------------------------------
1 files changed, 8 insertions(+), 33 deletions(-)
---
diff --git a/hamcrest.spec b/hamcrest.spec
index 6f49fe9..9578b6c 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -48,12 +48,9 @@
%bcond_with tests
%endif
-%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}}}
-
Name: hamcrest
Version: 1.1
-Release: 9.2%{?dist}
+Release: 9.3%{?dist}
Epoch: 0
Summary: Library of matchers for building test expressions
License: BSD
@@ -98,11 +95,7 @@ BuildRequires: testng
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-%else
-Buildarch: noarch
-%endif
+BuildArch: noarch
Requires(post): jpackage-utils >= 0:1.7.4
Requires(postun): jpackage-utils >= 0:1.7.4
@@ -239,33 +232,17 @@ install -m 644 build/%{name}-examples-%{version}.jar $RPM_BUILD_ROOT%{_datadir}/
cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
%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)
+%defattr(-,root,root,-)
%doc LICENSE.txt
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/all-%{version}.jar
@@ -288,23 +265,21 @@ fi
%endif
%{_datadir}/maven2/*
%{_mavendepmapfragdir}/*
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/all-%{version}.jar.db
-%attr(-,root,root) %{_libdir}/gcj/%{name}/all-%{version}.jar.so
-%endif
%files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%files demo
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%{_datadir}/%{name}-%{version}
%{_datadir}/%{name}
%changelog
+* Thu Oct 7 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.1-9.3
+- Drop gcj support.
+
* Tue Aug 18 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1-9.2
- Add OSGi manifest for hamcrest-core.
- Make javadoc package noarch.
More information about the scm-commits
mailing list