rpms/icu4j/devel icu4j.spec,1.20,1.21
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Sep 29 11:32:26 UTC 2009
- Previous message (by thread): rpms/nazghul/F-12 nazghul-make-snapshot, NONE, 1.1 nazghul.spec, 1.24, 1.25 sources, 1.10, 1.11
- Next message (by thread): rpms/ecryptfs-utils/F-11 .cvsignore, 1.27, 1.28 ecryptfs-utils-75-nocryptdisks.patch, 1.2, 1.3 ecryptfs-utils.spec, 1.51, 1.52 sources, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: akurtakov
Update of /cvs/pkgs/rpms/icu4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4043/devel
Modified Files:
icu4j.spec
Log Message:
Simplify with_eclipse conditional.
Index: icu4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- icu4j.spec 10 Aug 2009 12:47:05 -0000 1.20
+++ icu4j.spec 29 Sep 2009 11:32:25 -0000 1.21
@@ -28,13 +28,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# If you want to build with eclipse support
-# give rpmbuild option '--with eclipse'
-
-%define _with_eclipse 1
-
-%define with_eclipse %{?_with_eclipse:1}%{!?_with_eclipse:0}
-%define without_eclipse %{!?_with_eclipse:1}%{?_with_eclipse:0}
+%define with_eclipse 1
%define section free
@@ -50,7 +44,7 @@
Name: icu4j
Version: 4.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
Summary: International Components for Unicode for Java
License: MIT and EPL
@@ -137,14 +131,14 @@ sed --in-place "/javac1.3/d" build.xml
sed --in-place "s:/usr/lib:%{_libdir}:g" build.xml
%build
-%if %{without_eclipse}
-%ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs
+%if %{with_eclipse}
+ %ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=%{eclipse_base} \
+ -Declipse.basews=gtk -Declipse.baseos=linux \
+ -Declipse.basearch=%{eclipse_arch} \
+ -Dicu4j.eclipse.build.version.string=4.0.1.v20090415 \
+ jar docs eclipsePDEBuild
%else
-%ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=%{eclipse_base} \
- -Declipse.basews=gtk -Declipse.baseos=linux \
- -Declipse.basearch=%{eclipse_arch} \
- -Dicu4j.eclipse.build.version.string=4.0.1.v20090415 \
- jar docs eclipsePDEBuild
+ %ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs
%endif
%install
@@ -191,6 +185,9 @@ unzip -qq -d %{buildroot}/%{eclipse_base
%endif
%changelog
+* Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:4.0.1-4
+- Simplify with_eclipse conditional.
+
* Mon Aug 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1:4.0.1-3
- Update qualifier to the Eclipse 3.5.0 release.
- Previous message (by thread): rpms/nazghul/F-12 nazghul-make-snapshot, NONE, 1.1 nazghul.spec, 1.24, 1.25 sources, 1.10, 1.11
- Next message (by thread): rpms/ecryptfs-utils/F-11 .cvsignore, 1.27, 1.28 ecryptfs-utils-75-nocryptdisks.patch, 1.2, 1.3 ecryptfs-utils.spec, 1.51, 1.52 sources, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list