rpms/joni/F-8 joni-set-java-5_0-target-and-source.patch, NONE, 1.1 joni.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Conrad Meyer (konradm)]

Author: konradm

Update of /cvs/pkgs/rpms/joni/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4262/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	joni-set-java-5_0-target-and-source.patch joni.spec 
Log Message:
Import of joni 1.0.2-4 into F-8 branch.


joni-set-java-5_0-target-and-source.patch:

--- NEW FILE joni-set-java-5_0-target-and-source.patch ---
--- build.xml.orig	2008-04-05 23:26:48.000000000 -0700
+++ build.xml	2008-04-05 23:28:00.000000000 -0700
@@ -1,8 +1,10 @@
 <?xml version="1.0" ?>
 <project name="Joni" default="build">
 
+    <property name="ant.build.javac.target" value="1.5" />
+    <property name="ant.build.javac.source" value="1.5" />
     <property name="src.dir" value="src" />
     <property name="bin.dir" value="target/classes" />
     <property name="dist.dir" value="target" />
     <property name="jar.name" value="joni.jar" />
 


--- NEW FILE joni.spec ---
Name:           joni
Version:        1.0.2
Release:        4%{?dist}
Summary:        Java regular expression library
Group:          Development/Libraries
License:        MIT
URL:            http://jruby.codehaus.org/
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
#   svn export http://svn.codehaus.org/jruby/joni/tags/1.0.2/ joni-1.0.2
#   tar -cjf joni-1.0.2.tar.bz2 joni-1.0.2
Source0:        %{name}-%{version}.tar.bz2
Patch0:         joni-set-java-5_0-target-and-source.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  java-devel >= 1.5
BuildRequires:  ant
BuildRequires:  jpackage-utils
BuildRequires:  java-gcj-compat-devel >= 1.0.31
Requires:       java >= 1.5
Requires:       jpackage-utils
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31

%description
joni is a port of Oniguruma, a regular expressions library,
to java. It is used by jruby.


%prep
%setup -q
%patch0 -p0


%build
ant build


%install
rm -rf %{buildroot}

# jars
install -d -m 755 %{buildroot}%{_javadir}
# install unversioned jar as per Java Packaging Guidelines
install -m 644 target/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar

%{_bindir}/aot-compile-rpm


%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi


%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc pom.xml
%{_javadir}/%{name}.jar
%{_libdir}/gcj/%{name}


%changelog
* Sat Apr 5 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.2-4
- Compile AOT bits.

* Sun Mar 16 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.2-3
- Bump to 1.0.2.
- Add pom.xml to doc.
- Install unversioned jar.

* Sun Mar 2 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.1-2
- joni is MIT, not BSD.
- Require java and BuildRequire java-devel, not icedtea.

* Sun Mar 2 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.1-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2008 03:50:26 -0000	1.1
+++ .cvsignore	7 Apr 2008 21:24:34 -0000	1.2
@@ -0,0 +1 @@
+joni-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2008 03:50:26 -0000	1.1
+++ sources	7 Apr 2008 21:24:34 -0000	1.2
@@ -0,0 +1 @@
+b6ce4ef70f477c286f1f49bc8c13a9f7  joni-1.0.2.tar.bz2