[eclipse] Clean up -V output.
sami wagiaalla
swagiaal at fedoraproject.org
Tue Oct 4 18:14:32 UTC 2011
commit e3d3284e1ace32841f73e8952a11ea988b77caf9
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date: Mon Oct 3 14:41:31 2011 -0400
Clean up -V output.
- Correct verification for files edited by the reconciler.
- Do not install state files.
eclipse.spec | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 5ea1e1d..8030bdc 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -206,13 +206,18 @@ pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
echo -n "" > %{_builddir}/%{buildsubdir}/%{name}-platform.install;
for id in `ls configuration/org.eclipse.osgi/bundles`; do
if [ "Xconfiguration" = $(echo X`find configuration/org.eclipse.osgi/bundles/$id -name libswt\*.so` | sed "s:/.*::") ]; then
- echo "%{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" > %{_builddir}/%{buildsubdir}/%{name}-swt.install;
+ echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" > %{_builddir}/%{buildsubdir}/%{name}-swt.install;
else
- echo "%{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
+ echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
fi
done
popd
+# Remove state files
+pushd $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.osgi/
+ rm -rf .bundledata* .lazy* .manager .state*
+popd
+
#install the reconciler script
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/
@@ -343,12 +348,6 @@ rm -rf %{_bindir}/efj/
%files rcp
%dir %{_libdir}/%{name}/features
%dir %{_datadir}/%{name}
-%if %{initialize}
-%{_libdir}/%{name}/configuration/org.eclipse.osgi/.bundledata*
-%{_libdir}/%{name}/configuration/org.eclipse.osgi/.lazy*
-%{_libdir}/%{name}/configuration/org.eclipse.osgi/.manager
-%{_libdir}/%{name}/configuration/org.eclipse.osgi/.state*
-%endif
%verify(not md5 size mtime) %dir %{_libdir}/%{name}/configuration
%verify(not md5 size mtime) %{_libdir}/%{name}/configuration/config.ini
%verify(not md5 size mtime) %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
@@ -556,6 +555,10 @@ rm -rf %{_bindir}/efj/
%changelog
* Mon Oct 3 2011 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.0-5
+- Correct verification for files edited by the reconciler.
+- Do not install state files.
+
+* Mon Oct 3 2011 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.0-5
- Add Requires post and postun platform to jdt and pde on
* Fri Sep 23 2011 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.0-4
More information about the scm-commits
mailing list