SPECS: java-derby.spec - renamed to java-derby
glen
glen at pld-linux.org
Wed Feb 25 00:55:05 CET 2009
Author: glen Date: Tue Feb 24 23:55:05 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- renamed to java-derby
---- Files affected:
SPECS:
java-derby.spec (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SPECS/java-derby.spec
diff -u SPECS/java-derby.spec:1.4 SPECS/java-derby.spec:1.5
--- SPECS/java-derby.spec:1.4 Sat Feb 9 22:00:47 2008
+++ SPECS/java-derby.spec Wed Feb 25 00:55:00 2009
@@ -5,42 +5,42 @@
#
Summary: Derby DB (ex Cloudscape)
Summary(pl.UTF-8): Derby DB (dawniej Cloudscape)
-Name: derby
+Name: java-derby
Version: 10.1.1.0
Release: 0.1
License: Apache v2.0
Group: Applications/Databases
-Source0: http://www.apache.org/dist/db/derby/db-derby-10.1.1.0/db-%{name}-%{version}-src.tar.gz
+Source0: http://www.apache.org/dist/db/derby/db-derby-%{version}/db-derby-%{version}-src.tar.gz
# Source0-md5: 122cbf34bf8e637802255baed5cc10ed
-Source1: %{name}-%{version}-test.script
-Patch0: %{name}-10.1.1.0-compilepath_properties.patch
-Patch1: %{name}-10.1.1.0-extrapath_properties.patch
-Patch2: %{name}-10.1.1.0-JDBC30only-BrokeredConnection.patch
-Patch3: %{name}-10.1.1.0-JDBC30only-BrokeredCallableStatement.patch
-Patch4: %{name}-10.1.1.0-JDBC30only-BrokeredPreparedStatement.patch
-Patch5: %{name}-10.1.1.0-JDBC30only-BrokeredCallableStatement30.patch
-Patch6: %{name}-10.1.1.0-JDBC30only-BrokeredConnection30.patch
-Patch7: %{name}-10.1.1.0-JDBC30only-EmbedConnection.patch
-Patch8: %{name}-10.1.1.0-JDBC30only-EmbedCallableStatement20.patch
-Patch9: %{name}-10.1.1.0-JDBC30only-EmbedPreparedStatement20.patch
+Source1: %{name}-test.script
+Patch0: %{name}-compilepath_properties.patch
+Patch1: %{name}-extrapath_properties.patch
+Patch2: %{name}-JDBC30only-BrokeredConnection.patch
+Patch3: %{name}-JDBC30only-BrokeredCallableStatement.patch
+Patch4: %{name}-JDBC30only-BrokeredPreparedStatement.patch
+Patch5: %{name}-JDBC30only-BrokeredCallableStatement30.patch
+Patch6: %{name}-JDBC30only-BrokeredConnection30.patch
+Patch7: %{name}-JDBC30only-EmbedConnection.patch
+Patch8: %{name}-JDBC30only-EmbedCallableStatement20.patch
+Patch9: %{name}-JDBC30only-EmbedPreparedStatement20.patch
URL: http://db.apache.org/derby/
-BuildRequires: ant >= 0:1.6
+BuildRequires: ant >= 1.6
BuildRequires: jakarta-oro
+BuildRequires: java-servletapi5
BuildRequires: javacc
BuildRequires: jdk >= 0:1.4.2
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: jta
BuildRequires: rpmbuild(macros) >= 1.300
-BuildRequires: servletapi5
BuildRequires: xalan-j
BuildRequires: xerces-j
BuildRequires: xml-commons-apis
-Requires: java >= 0:1.4.2
+Requires: jakarta-oro
+Requires: java >= 1.4.2
+Requires: java-servletapi5
Requires: jta
-Requires: oro
-Requires: servletapi5
-Requires: xalan-j2
-Requires: xerces-j2
+Requires: xalan-j
+Requires: xerces-j
Requires: xml-commons-apis
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -90,9 +90,7 @@
Summary: Javadoc for Derby DB
Summary(pl.UTF-8): Dokumentacja javadoc do Derby DB
Group: Documentation
-Requires(post): /bin/rm
-Requires(post): /bin/ln
-Requires(postun): /bin/rm
+Requires: jpackage-utils
%description javadoc
Javadoc for Derby DB.
@@ -123,9 +121,8 @@
Przykłady do Derby DB.
%prep
-%setup -q -n db-%{name}-%{version}-src
-
-for j in $(find . -name "*.jar"); do
+%setup -q -n db-derby-%{version}-src
+for j in $(find -name '*.jar'); do
mv $j $j.no
done
@@ -141,32 +138,24 @@
%patch9
%build
-cd tools/java
-ln -sf $(build-classpath javacc) .
-ln -sf $(build-classpath jta) .
-ln -sf $(build-classpath jce) .
-ln -sf $(build-classpath servletapi5) .
-ln -sf $(build-classpath oro) .
-ln -sf $(build-classpath xalan-j2) .
-ln -sf $(build-classpath xerces-j2) .
-ln -sf $(build-classpath xml-commons-apis) .
-cd -
+required_jars="javacc jta jce servletapi5 oro xalan xerces-j2 xml-commons-apis"
+
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
export OPT_JAR_LIST="ant/ant-nodeps"
-# set both jres to 1.4.2 !!
%ant \
- -Dj13lib=/usr/lib/jvm/java-1.4.2/jre/lib \
- -Dj14lib=/usr/lib/jvm/java-1.4.2/jre/lib \
+ -Dj13lib=$JAVA_HOME/jre/lib \
+ -Dj14lib=$JAVA_HOME/jre/lib \
buildsource testing buildjarsclean javadoc
%if %{with tests}
mkdir testdir
-cp %{SOURCE1} testdir/testderby.sh
+install %{SOURCE1} testdir/testderby.sh
cd testdir
-chmod +x testderby.sh
./testderby.sh
-for f in $(find . -name "*.fail"); do
+for f in $(find -name '*.fail'); do
echo FAILED $f
cat $f
done
@@ -232,13 +221,7 @@
rm -rf $RPM_BUILD_ROOT
%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
- rm -f %{_javadocdir}/%{name}
-fi
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
%files
%defattr(644,root,root,755)
@@ -247,8 +230,8 @@
%files javadoc
%defattr(644,root,root,755)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
%files manual
%defattr(644,root,root,755)
@@ -260,6 +243,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2009/02/24 23:55:00 glen
+- renamed to java-derby
+
Revision 1.4 2008/02/09 21:00:47 qboosh
- unified License format
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-derby.spec?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list