rpms/aqute-bndlib/devel aqute-bndlib.spec,1.3,1.4
Andrew Overholt
overholt at fedoraproject.org
Mon Aug 17 20:42:49 UTC 2009
- Previous message: rpms/automaton/devel .cvsignore, 1.4, 1.5 automaton.spec, 1.5, 1.6 sources, 1.4, 1.5
- Next message: rpms/TurboGears/EL-5 feedkid.diff, NONE, 1.1 TurboGears.spec, 1.25, 1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: overholt
Update of /cvs/pkgs/rpms/aqute-bndlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7770
Modified Files:
aqute-bndlib.spec
Log Message:
* Mon Aug 17 2009 Andrew Overholt <overholt at redhat.com> 0.0.203-4.2
- Remove gcj support
Index: aqute-bndlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqute-bndlib/devel/aqute-bndlib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- aqute-bndlib.spec 17 Aug 2009 20:14:52 -0000 1.3
+++ aqute-bndlib.spec 17 Aug 2009 20:42:49 -0000 1.4
@@ -28,15 +28,9 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _without_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 section free
-
Name: aqute-bndlib
Version: 0.0.203
-Release: 4.1%{?dist}
+Release: 4.2%{?dist}
Epoch: 0
Summary: BND Library
License: ASL 2.0
@@ -47,22 +41,12 @@ Source1: http://www.aqute.biz/rep
Patch0: aQute-bndlib-Filter.patch
-%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
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: java-devel >= 0:1.5.0
BuildRequires: ant >= 0:1.6.5
-#BuildRequires: ecj
BuildRequires: eclipse-ecj
BuildRequires: eclipse-jdt
@@ -90,7 +74,6 @@ Group: Development/Documentatio
%description javadoc
Javadoc for %{name}.
-
%prep
%setup -q -c
mkdir -p target/site/apidocs/
@@ -144,30 +127,14 @@ install -d -m 755 $RPM_BUILD_ROOT%{_java
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{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)
@@ -175,11 +142,6 @@ fi
%{_javadir}/%{name}.jar
%{_datadir}/maven2/poms/JPP-aqute-bndlib.pom
%{_mavendepmapfragdir}/aqute-bndlib
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.db
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.so
-%endif
%files javadoc
%defattr(0644,root,root,0755)
@@ -187,6 +149,9 @@ fi
%{_javadocdir}/%{name}
%changelog
+* Mon Aug 17 2009 Andrew Overholt <overholt at redhat.com> 0.0.203-4.2
+- Remove gcj support
+
* Wed May 20 2009 Fernando Nasser <fnasser at redhat.com> 0.0.203-4.1
- Remove unedded BRs at Andrew Overholt's recommendation
- Changed libdir to /usr/lib* at 'ajax' suggestion on irc to avoid
- Previous message: rpms/automaton/devel .cvsignore, 1.4, 1.5 automaton.spec, 1.5, 1.6 sources, 1.4, 1.5
- Next message: rpms/TurboGears/EL-5 feedkid.diff, NONE, 1.1 TurboGears.spec, 1.25, 1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list