OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Feb-2008 10:26:07
Branch: HEAD Handle: 2008021709260600
Modified files:
openpkg-src/yaml yaml.spec
Log:
upgrade Syck stuff and add Java APIs
Summary:
Revision Changes Path
1.59 +47 -4 openpkg-src/yaml/yaml.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/yaml/yaml.spec
============================================================================
$ cvs diff -u -r1.58 -r1.59 yaml.spec
--- openpkg-src/yaml/yaml.spec 16 Feb 2008 19:06:58 -0000 1.58
+++ openpkg-src/yaml/yaml.spec 17 Feb 2008 09:26:06 -0000 1.59
@@ -25,7 +25,7 @@
%define V_libsyck 20070218
%define V_libyaml 0.1.1
%define V_perl_yaml 0.66
-%define V_perl_yaml_syck 1.03
+%define V_perl_yaml_syck 1.04
%define V_perl_yaml_tiny 1.25
%define V_perl_yaml_appconfig 0.16
%define V_perl_yaml_libyaml 0.26
@@ -33,6 +33,8 @@
%define V_perl_io_yaml 0.07
%define V_yaml_javascript 0.03
%define V_yaml_spec 2004-12-28
+%define V_java_jvyaml 0.2.1
+%define V_java_jyaml 1.3
# package information
Name: yaml
@@ -45,12 +47,13 @@
Group: Language
License: BSD/Artistic
Version: 0
-Release: 20080216
+Release: 20080217
# package options
%option with_perl no
%option with_php no
%option with_ruby no
+%option with_java no
# list of sources
Source0: ftp://ftp.openpkg.org/sources/CPY/yaml/syck-%{V_libsyck}.tar.gz
@@ -63,8 +66,10 @@
Source7:
http://www.cpan.org/modules/by-module/YAML/YAML-Active-%{V_perl_yaml_active}.tar.gz
Source8:
http://www.cpan.org/authors/id/N/NK/NKUITSE/IO-YAML-%{V_perl_io_yaml}.tar.gz
Source9:
http://osdn.dl.sourceforge.net/yaml-javascript/yaml-javascript-%{V_yaml_javascript}.tar.gz
-Source10: http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf
-Source11: yaml.yml
+Source10:
https://jvyaml.dev.java.net/files/documents/5215/41455/jvyaml-src-%{V_java_jvyaml}.tar.gz
+Source11:
http://switch.dl.sourceforge.net/jyaml/jyaml-src-%{V_java_jyaml}.tgz
+Source12: http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf
+Source13: yaml.yml
Patch0: yaml.patch
# build information
@@ -84,6 +89,10 @@
BuildPreReq: ruby
PreReq: ruby
%endif
+%if "%{with_java}" == "yes"
+BuildPreReq: java, JAVA-JDK, ant
+PreReq: java, JAVA-JDK
+%endif
AutoReq: no
AutoReqProv: no
@@ -152,6 +161,16 @@
url = http://yaml.org/spec/
regex = (\d{4}-\d{2}-\d{2})\.pdf
}
+ prog yaml:java-jvyaml = {
+ version = %{V_java_jvyaml}
+ url = https://jvyaml.dev.java.net/servlets/ProjectDocumentList
+ regex = jvyaml-src-(__VER__)\.tar\.gz
+ }
+ prog yaml:java-jyaml = {
+ version = %{V_java_jyaml}
+ url = http://prdownloads.sourceforge.net/jyaml/
+ regex = jyaml-src-(__VER__)\.tgz
+ }
%prep
%setup -q -c
@@ -164,6 +183,8 @@
%setup -q -T -D -a 7
%setup -q -T -D -a 8
%setup -q -T -D -a 9
+ %setup -q -T -D -a 10
+ %setup -q -T -D -a 11
%patch -p0
%build
@@ -220,6 +241,16 @@
%{l_prefix}/bin/perl-openpkg -d IO-YAML-%{V_perl_io_yaml}
configure build
%endif
+ # build Java API
+%if "%{with_java}" == "yes"
+ ( cd jvyaml-%{V_java_jvyaml}
+ %{l_prefix}/bin/ant
+ ) || exit $?
+ ( cd jyaml
+ %{l_prefix}/bin/ant
+ ) || exit $?
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -261,6 +292,18 @@
>perl-openpkg-files
%endif
+ # install Java API
+%if "%{with_java}" == "yes"
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/yaml
+ %{l_shtool} install -c -m 644 \
+ jvyaml-%{V_java_jvyaml}/lib/jvyaml.jar \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/yaml/
+ %{l_shtool} install -c -m 644 \
+ jyaml/dist/jyaml-*.jar \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/yaml/jyaml.jar
+%endif
+
# install JavaScript API
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/yaml
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
