rpms/eclipse/F-9 eclipse-copy-platform.sh, 1.5, 1.6 eclipse.spec, 1.527, 1.528
Mat Booth (mbooth)
fedora-extras-commits at redhat.com
Sat Apr 26 00:17:05 UTC 2008
Author: mbooth
Update of /cvs/pkgs/rpms/eclipse/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25160/F-9
Modified Files:
eclipse-copy-platform.sh eclipse.spec
Log Message:
* Sat Apr 26 2008 Mat Booth <fedora at matbooth.co.uk> 3.3.2-11
- Fixed some benign errors in copy-platform when calling pdebuild
multiple times.
Index: eclipse-copy-platform.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-9/eclipse-copy-platform.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-copy-platform.sh 7 Nov 2006 05:45:12 -0000 1.5
+++ eclipse-copy-platform.sh 26 Apr 2008 00:16:27 -0000 1.6
@@ -27,16 +27,15 @@
where=$1; shift
eclipse=$1; shift
-mkdir $where
+mkdir -p $where/plugins $where/features $where/links
cd $where
-mkdir plugins features links
# Are there any optional arguments left?
if [ $# -gt 0 ]; then
for optional in "$@"; do
(cd $eclipse; ls -d plugins/*"$optional"* features/*"$optional"*) |
while read f; do
- ln -s $eclipse/$f $f
+ [ ! -e $f ] && ln -s $eclipse/$f $f
done
done
fi
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-9/eclipse.spec,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -r1.527 -r1.528
--- eclipse.spec 25 Apr 2008 16:55:30 -0000 1.527
+++ eclipse.spec 26 Apr 2008 00:16:27 -0000 1.528
@@ -20,7 +20,7 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 10%{?dist}
+Release: 11%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -1013,7 +1013,7 @@
ls -d * | egrep -v '^(plugins|features|links|about_files)$'
ls -d plugins/* features/* links/*
) |
-sed -e's/^\(.*\)$/\1 \1/' -e's,^,ln -s $eclipse/,' >> copy-platform
+sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $eclipse/\1 \1,' >> copy-platform
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
@@ -1652,6 +1652,10 @@
%endif
%changelog
+* Sat Apr 26 2008 Mat Booth <fedora at matbooth.co.uk> 3.3.2-11
+- Fixed some benign errors in copy-platform when calling pdebuild
+ multiple times.
+
* Fri Apr 25 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-10
- Bump maximum heap size from 256 MB to 512 MB.
- Add patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092
More information about the scm-commits
mailing list