rpms/joni/F-8 .cvsignore,1.2,1.3 joni.spec,1.1,1.2 sources,1.2,1.3
Conrad Meyer (konradm)
fedora-extras-commits at redhat.com
Sat Jul 19 11:05:52 UTC 2008
Author: konradm
Update of /cvs/pkgs/rpms/joni/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3105
Modified Files:
.cvsignore joni.spec sources
Log Message:
* Sat Jul 19 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-0.2.svn7235
- Bump revision because of stupid packager's mistake.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 7 Apr 2008 21:24:34 -0000 1.2
+++ .cvsignore 19 Jul 2008 11:05:01 -0000 1.3
@@ -1 +1 @@
-joni-1.0.2.tar.bz2
+joni-1.0.3.tar.bz2
Index: joni.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-8/joni.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- joni.spec 7 Apr 2008 21:24:34 -0000 1.1
+++ joni.spec 19 Jul 2008 11:05:01 -0000 1.2
@@ -1,26 +1,32 @@
-Name: joni
-Version: 1.0.2
-Release: 4%{?dist}
-Summary: Java regular expression library
-Group: Development/Libraries
-License: MIT
-URL: http://jruby.codehaus.org/
+Name: joni
+Version: 1.0.3
+Release: 0.2.svn7235%{?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
+# svn export -r 7235 http://svn.codehaus.org/jruby/joni/trunk/ joni-1.0.3
+# tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3
+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
+Requires: java >= 1.5
+Requires: jpackage-utils
+
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%else
+BuildRequires: java-gcj-compat-devel >= 1.0.31
Requires(post): java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
+%endif
+
%description
joni is a port of Oniguruma, a regular expressions library,
@@ -47,18 +53,22 @@
%{_bindir}/aot-compile-rpm
+%if 0%{?fedora} <= 9
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
+%endif
+%if 0%{?fedora} <= 9
%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
+%endif
%clean
@@ -69,10 +79,20 @@
%defattr(-,root,root,-)
%doc pom.xml
%{_javadir}/%{name}.jar
+
+%if 0%{?fedora} <= 9
%{_libdir}/gcj/%{name}
+%endif
%changelog
+* Sat Jul 19 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-0.2.svn7235
+- Bump revision because of stupid packager's mistake.
+
+* Sat Jul 19 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-0.1.svn7235
+- Bump to trunk version of joni for JRuby 1.1.3.
+- Switch to noarch for fc10 and up.
+
* Sat Apr 5 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.2-4
- Compile AOT bits.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Apr 2008 21:24:34 -0000 1.2
+++ sources 19 Jul 2008 11:05:01 -0000 1.3
@@ -1 +1 @@
-b6ce4ef70f477c286f1f49bc8c13a9f7 joni-1.0.2.tar.bz2
+80642979735e3b98f05f8377f6734ed9 joni-1.0.3.tar.bz2
More information about the fedora-extras-commits
mailing list