[java-1.7.0-openjdk] Forcibly remove bfc files
Deepak Bhole
dbhole at fedoraproject.org
Fri Apr 19 19:54:56 UTC 2013
commit 36baab508645e5f7a67d8aaf9a509e80d3d48f64
Author: Deepak Bhole <dbhole at redhat.com>
Date: Fri Apr 19 15:54:25 2013 -0400
Forcibly remove bfc files
java-1.7.0-openjdk.spec | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index f4fc395..d2a0ad1 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -926,12 +926,12 @@ popd
echo "sun.zoneinfo.dir=/usr/share/javazi" >> $JAVA_HOME/jre/lib/tz.properties
#remove all fontconfig files. This change should be usptreamed soon
-rm %{buildoutputdir}/j2re-image/lib/fontconfig*.properties.src
-rm %{buildoutputdir}/j2re-image/lib/fontconfig*.bfc
-rm %{buildoutputdir}/j2sdk-image/jre/lib/fontconfig*.properties.src
-rm %{buildoutputdir}/j2sdk-image/jre/lib/fontconfig*.bfc
-rm %{buildoutputdir}/lib/fontconfig*.properties.src
-rm %{buildoutputdir}/lib/fontconfig*.bfc
+rm -f %{buildoutputdir}/j2re-image/lib/fontconfig*.properties.src
+rm -f %{buildoutputdir}/j2re-image/lib/fontconfig*.bfc
+rm -f %{buildoutputdir}/j2sdk-image/jre/lib/fontconfig*.properties.src
+rm -f %{buildoutputdir}/j2sdk-image/jre/lib/fontconfig*.bfc
+rm -f %{buildoutputdir}/lib/fontconfig*.properties.src
+rm -f %{buildoutputdir}/lib/fontconfig*.bfc
%install
rm -rf $RPM_BUILD_ROOT
@@ -1405,6 +1405,7 @@ exit 0
%changelog
* Fri Apr 19 2013 Deepak Bhole <dbhole at redhat.com> - 1.7.0.19-2.3.9.3.fc20
- Updated 2.1.8 tarball
+- Forcibly remove bfc files
* Thu Apr 18 2013 Deepak Bhole <dbhole at redhat.com> - 1.7.0.19-2.3.9.2.fc20
- Updated secondary arches to 2.1.8
More information about the scm-commits
mailing list