[eclipse-quickrex] Fix FTBFS.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Jun 29 07:44:44 UTC 2011
commit 8a1ef3e876a18175b7a74c4f8d31663f7dbf9657
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Jun 29 10:44:14 2011 +0300
Fix FTBFS.
eclipse-quickrex.spec | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/eclipse-quickrex.spec b/eclipse-quickrex.spec
index ce4183c..f83bb88 100644
--- a/eclipse-quickrex.spec
+++ b/eclipse-quickrex.spec
@@ -7,7 +7,7 @@
Name: eclipse-quickrex
Version: 3.5.0
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: %{upstream_name} is a regular-expression test Eclipse Plug-In
Group: Development/Tools
@@ -23,7 +23,6 @@ Source1: fetch-quickrex.sh
Source2: build.properties
Source3: feature.xml
Patch0: quickrex-disable-jregex-capability.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel >= 1.5.0
BuildArch: noarch
@@ -53,7 +52,7 @@ cp -p %{SOURCE2} %{SOURCE3} quickrex-features
pushd Plug-In
%patch0 -p0
pushd lib
-ln -s %{_javadir}/%{oro_jar}
+ln -s %{_javadir}/jakarta-oro.jar %{oro_jar}
ln -s %{_javadir}/regexp.jar %{regexp_jar}
popd
popd
@@ -62,7 +61,6 @@ popd
%{eclipse_base}/buildscripts/pdebuild
%install
-rm -rf %{buildroot}
installDir=%{buildroot}%{install_loc}/quickrex
install -d -m 755 $installDir
unzip -q -d $installDir \
@@ -72,19 +70,18 @@ unzip -q -d $installDir \
pushd $installDir/eclipse/plugins/de.babe.eclipse.plugins.QuickREx_%{version}/lib
rm %{oro_jar}
rm %{regexp_jar}
-ln -s %{_javadir}/%{oro_jar}
+ln -s %{_javadir}/jakarta-oro.jar %{oro_jar}
ln -s %{_javadir}/regexp.jar %{regexp_jar}
popd
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%doc Plug-In/html
%{install_loc}/quickrex
%changelog
+* Wed Jun 29 2011 Alexander Kurtakov <akurtako at redhat.com> 3.5.0-14
+- Fix FTBFS.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list