rpms/jcodings/F-10 jcodings-1.0-buildlevel-1.5.diff, NONE, 1.1 jcodings.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Conrad Meyer konradm at fedoraproject.org
Mon Feb 16 12:53:03 UTC 2009


Author: konradm

Update of /cvs/pkgs/rpms/jcodings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17486

Modified Files:
	.cvsignore sources 
Added Files:
	jcodings-1.0-buildlevel-1.5.diff jcodings.spec 
Log Message:
Build jruby 1.1.6 for F-10.

jcodings-1.0-buildlevel-1.5.diff:

--- NEW FILE jcodings-1.0-buildlevel-1.5.diff ---
--- build.xml.orig	2008-12-17 14:37:29.000000000 -0800
+++ build.xml	2008-12-17 14:39:06.000000000 -0800
@@ -3,10 +3,12 @@
 
     <property name="src.dir" value="src" />
     <property name="bin.dir" value="target/classes" />
     <property name="dist.dir" value="target" />
     <property name="jar.name" value="jcodings.jar" />
+    <property name="ant.build.javac.target" value="1.5" />
+    <property name="ant.build.javac.source" value="1.5" />
 
     <target name="clean">
         <delete dir="${bin.dir}" />
         <delete dir="${dist.dir}" />
 


--- NEW FILE jcodings.spec ---
%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           jcodings
Version:        1.0.1
Release:        1%{?dist}
Summary:        Java Libraries for Ruby String Encodings
Group:          Development/Libraries
License:        MIT
URL:            http://svn.jruby.codehaus.org/browse/jruby/jcodings
Source0:        http://svn.jruby.codehaus.org/browse/~tarball=tbz2/jruby/jcodings/tags/%{version}/%{version}.tbz2
Patch0:         jcodings-1.0-buildlevel-1.5.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant
BuildRequires:  java-devel
BuildRequires:  jpackage-utils
Requires:       java
Requires:       jpackage-utils

%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
Java libraries for handling JRuby string encodings.


%prep
%setup -q -c
find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
%patch0


%build
ant build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p target/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
pushd $RPM_BUILD_ROOT%{_javadir}/
  ln -s %{name}-%{version}.jar %{name}.jar
popd

%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}/*
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif


%changelog
* Sun Feb 15 2009 Conrad Meyer <konrad at tylerc.org> - 1.0.1-1
- Bump to 1.0.1 for jruby 1.1.6.

* Wed Dec 17 2008 Conrad Meyer <konrad at tylerc.org> - 1.0-2
- Add gcj bits.

* Fri Nov 28 2008 Conrad Meyer <konrad at tylerc.org> - 1.0-1
- Initial package (needed for jruby 1.1.5 and joni 1.1.1).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jcodings/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:30:43 -0000	1.1
+++ .cvsignore	16 Feb 2009 12:52:32 -0000	1.2
@@ -0,0 +1 @@
+1.0.1.tbz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jcodings/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:30:43 -0000	1.1
+++ sources	16 Feb 2009 12:52:32 -0000	1.2
@@ -0,0 +1 @@
+52e65f77c11162ff4c8d1e1905e8ddeb  1.0.1.tbz2




More information about the fedora-extras-commits mailing list