Author: pawelz Date: Thu Apr 9 21:34:25 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- versioned rpm BR
- unified jdk bconds
- user %%{srcname}
---- Files affected:
SPECS:
java-commons-digester.spec (1.27 -> 1.28)
---- Diffs:
================================================================
Index: SPECS/java-commons-digester.spec
diff -u SPECS/java-commons-digester.spec:1.27
SPECS/java-commons-digester.spec:1.28
--- SPECS/java-commons-digester.spec:1.27 Sun Mar 29 16:25:40 2009
+++ SPECS/java-commons-digester.spec Thu Apr 9 23:34:20 2009
@@ -5,7 +5,9 @@
%bcond_with java_sun # build with java-sun
%if "%{pld_release}" == "ti"
-%define with_java_sun 1
+%bcond_without java_sun # build with gcj
+%else
+%bcond_with java_sun # build with java-sun
%endif
%include /usr/lib/rpm/macros.java
@@ -18,7 +20,7 @@
Release: 3
License: Apache v2.0
Group: Libraries/Java
-Source0:
http://www.apache.org/dist/commons/digester/source/commons-digester-%{version}-src.tar.gz
+Source0:
http://www.apache.org/dist/commons/digester/source/%{srcname}-%{version}-src.tar.gz
# Source0-md5: 718f91f6958da865826bca455f644076
URL: http://commons.apache.org/digester/
BuildRequires: ant
@@ -28,6 +30,7 @@
%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
%{?with_java_sun:BuildRequires: java-sun}
BuildRequires: jpackage-utils
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires: java-commons-beanutils
@@ -74,7 +77,7 @@
Dokumentacja do Commons Digester.
%prep
-%setup -q -n commons-digester-%{version}-src
+%setup -q -n %{srcname}-%{version}-src
%build
required_jars="commons-beanutils-core commons-collections commons-logging"
@@ -88,8 +91,8 @@
install -d $RPM_BUILD_ROOT%{_javadir}
# jars
-cp -a dist/commons-digester.jar
$RPM_BUILD_ROOT%{_javadir}/commons-digester-%{version}.jar
-ln -s commons-digester-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/commons-digester.jar
+cp -a dist/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
# javadoc
%if %{with javadoc}
@@ -122,6 +125,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.28 2009/04/09 21:34:20 pawelz
+- versioned rpm BR
+- unified jdk bconds
+- user %%{srcname}
+
Revision 1.27 2009/03/29 14:25:40 pawelz
- build fix for Titanium
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-digester.spec?r1=1.27&r2=1.28&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
