[eclipse/f17] Don't fail if icon.xpm does not exist.

swagiaal swagiaal at fedoraproject.org
Wed Apr 18 15:58:29 UTC 2012


commit bf5e43d21366edf7f57a1150793aef89430ea048
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date:   Thu Jan 1 00:00:02 1970 -0018

    Don't fail if icon.xpm does not exist.

 eclipse.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index ef38a3e..bcfa40d 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -20,7 +20,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        0.11.I201204051114%{?dist}
+Release:        0.12.I201204051114%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -239,7 +239,7 @@ ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -Dmultilib=true installSDKinDropins
 
 # We don't need icon.xpm
 # https://bugs.eclipse.org/292472
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/icon.xpm
+rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/icon.xpm
 
 # Some directories we need
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
@@ -652,6 +652,9 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Wed Apr 18 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:4.2.0-0.12.I201204051114
+- Don't fail if icon.xpm does not exist.
+
 * Thu Apr 12 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-0.11.I201204051114
 - Version more requirements.
 - Move java requirement to the lowest-in-stack package.


More information about the scm-commits mailing list