[CVS] OpenPKG: openpkg-src/fop/ fop.sh fop.spec
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: 27-Aug-2007 10:56:02
Branch: HEAD Handle: 2007082709560100
Modified files:
openpkg-src/fop fop.sh fop.spec
Log:
switch to new Java toolkit world order
Summary:
RevisionChanges Path
1.4 +1 -1 openpkg-src/fop/fop.sh
1.24+2 -2 openpkg-src/fop/fop.spec
patch -p0 '@@ .'
Index: openpkg-src/fop/fop.sh
$ cvs diff -u -r1.3 -r1.4 fop.sh
--- openpkg-src/fop/fop.sh25 Aug 2007 07:20:25 - 1.3
+++ openpkg-src/fop/fop.sh27 Aug 2007 08:56:01 - 1.4
@@ -16,7 +16,7 @@
fi
done
[EMAIL PROTECTED]@/bin/java \
[EMAIL PROTECTED]@/bin/java -Vsun-jdk \
-classpath $LOCALCLASSPATH \
-Djava.awt.headless=true \
$FOP_OPTS \
@@ .
patch -p0 '@@ .'
Index: openpkg-src/fop/fop.spec
$ cvs diff -u -r1.23 -r1.24 fop.spec
--- openpkg-src/fop/fop.spec 25 Aug 2007 07:20:25 - 1.23
+++ openpkg-src/fop/fop.spec 27 Aug 2007 08:56:01 - 1.24
@@ -33,7 +33,7 @@
Group:Typesetting
License: GPL
Version: 0.94
-Release: 20070825
+Release: 20070827
# list of sources
Source0:
http://www.apache.org/dist/xmlgraphics/fop/fop-%{version}-bin-jdk1.4.tar.gz
@@ -43,7 +43,7 @@
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20040130
-PreReq: OpenPKG, openpkg = 20040130, JRE
+PreReq: OpenPKG, openpkg = 20040130, java, java-jdk15
AutoReq: no
AutoReqProv: no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/fop/ fop.sh fop.spec
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: 25-Aug-2007 08:51:50
Branch: HEAD Handle: 2007082507515000
Modified files:
openpkg-src/fop fop.sh fop.spec
Log:
upgrading package: fop 0.20.5 - 0.94
Summary:
RevisionChanges Path
1.2 +1 -1 openpkg-src/fop/fop.sh
1.22+9 -6 openpkg-src/fop/fop.spec
patch -p0 '@@ .'
Index: openpkg-src/fop/fop.sh
$ cvs diff -u -r1.1 -r1.2 fop.sh
--- openpkg-src/fop/fop.sh10 Nov 2002 13:16:10 - 1.1
+++ openpkg-src/fop/fop.sh25 Aug 2007 06:51:50 - 1.2
@@ -19,6 +19,6 @@
@l_prefix@/bin/java \
-classpath $LOCALCLASSPATH \
$FOP_OPTS \
-org.apache.fop.apps.Fop \
+org.apache.fop.cli.Main \
${1+$@}
@@ .
patch -p0 '@@ .'
Index: openpkg-src/fop/fop.spec
$ cvs diff -u -r1.21 -r1.22 fop.spec
--- openpkg-src/fop/fop.spec 17 May 2007 16:01:34 - 1.21
+++ openpkg-src/fop/fop.spec 25 Aug 2007 06:51:50 - 1.22
@@ -32,11 +32,11 @@
Class:EVAL
Group:Typesetting
License: GPL
-Version: 0.20.5
-Release: 20070517
+Version: 0.94
+Release: 20070825
# list of sources
-Source0:
http://www.apache.org/dist/xmlgraphics/fop/fop-%{version}-bin.tar.gz
+Source0:
http://www.apache.org/dist/xmlgraphics/fop/fop-%{version}-bin-jdk1.4.tar.gz
Source1: fop.sh
# build information
@@ -60,7 +60,7 @@
prog fop = {
version = %{version}
url = http://www.apache.org/dist/xmlgraphics/fop/
-regex = fop-(\d+\.\d+\.\d+)-bin\.tar\.gz
+regex = fop-(\d+\.\d+(?:\.\d+)?)-bin(?:-jdk1.[456])?\.tar\.gz
}
%prep
@@ -79,14 +79,17 @@
build/*.jar lib/*.jar \
$RPM_BUILD_ROOT%{l_prefix}/lib/fop/
%{l_shtool} install -c -m 644 \
-docs/xslfoRef.pdf \
+docs/*.pdf \
$RPM_BUILD_ROOT%{l_prefix}/share/fop/
%{l_shtool} install -c -m 644 \
conf/* $RPM_BUILD_ROOT%{l_prefix}/share/fop/conf/
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE fop.sh} \
$RPM_BUILD_ROOT%{l_prefix}/bin/fop
-%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+%{l_files_std} \
+'%config %{l_prefix}/etc/fop/*' \
+'%doc %{l_prefix}/share/fop/*.pdf'
%files -f files
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/fop/ fop.sh fop.spec
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: 25-Aug-2007 09:20:25
Branch: HEAD Handle: 2007082508202500
Modified files:
openpkg-src/fop fop.sh fop.spec
Log:
modifying package: fop-0.94 20070825 again
Summary:
RevisionChanges Path
1.3 +2 -1 openpkg-src/fop/fop.sh
1.23+3 -2 openpkg-src/fop/fop.spec
patch -p0 '@@ .'
Index: openpkg-src/fop/fop.sh
$ cvs diff -u -r1.2 -r1.3 fop.sh
--- openpkg-src/fop/fop.sh25 Aug 2007 06:51:50 - 1.2
+++ openpkg-src/fop/fop.sh25 Aug 2007 07:20:25 - 1.3
@@ -4,7 +4,7 @@
. $HOME/.foprc
fi
[EMAIL PROTECTED]@/share/fop
[EMAIL PROTECTED]@/etc/fop
export FOP_HOME
LOCALCLASSPATH=
@@ -18,6 +18,7 @@
@l_prefix@/bin/java \
-classpath $LOCALCLASSPATH \
+-Djava.awt.headless=true \
$FOP_OPTS \
org.apache.fop.cli.Main \
${1+$@}
@@ .
patch -p0 '@@ .'
Index: openpkg-src/fop/fop.spec
$ cvs diff -u -r1.22 -r1.23 fop.spec
--- openpkg-src/fop/fop.spec 25 Aug 2007 06:51:50 - 1.22
+++ openpkg-src/fop/fop.spec 25 Aug 2007 07:20:25 - 1.23
@@ -74,6 +74,7 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/lib/fop \
+$RPM_BUILD_ROOT%{l_prefix}/etc/fop/conf \
$RPM_BUILD_ROOT%{l_prefix}/share/fop/conf
%{l_shtool} install -c -m 644 \
build/*.jar lib/*.jar \
@@ -82,13 +83,13 @@
docs/*.pdf \
$RPM_BUILD_ROOT%{l_prefix}/share/fop/
%{l_shtool} install -c -m 644 \
-conf/* $RPM_BUILD_ROOT%{l_prefix}/share/fop/conf/
+conf/* $RPM_BUILD_ROOT%{l_prefix}/etc/fop/conf/
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE fop.sh} \
$RPM_BUILD_ROOT%{l_prefix}/bin/fop
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
-'%config %{l_prefix}/etc/fop/*' \
+'%config %{l_prefix}/etc/fop/conf/*' \
'%doc %{l_prefix}/share/fop/*.pdf'
%files -f files
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
