Don't use tmpfs for run-reconciler file.
* Tue Dec 20 2011 Sami Wagiaalla <swagiaal@redhat.com> 1:3.7.1-10 - Use rpm-state/eclipse for run-reconciler file instead of /var/run. - Delete eclipse-tmpfiles.conf.
This commit is contained in:
parent
7a836001f0
commit
42e97c9d9c
@ -9,6 +9,8 @@
|
|||||||
# A list of the files of directory that are to be backed up
|
# A list of the files of directory that are to be backed up
|
||||||
config_files=("artifacts.xml" "eclipse.ini" "p2" "configuration")
|
config_files=("artifacts.xml" "eclipse.ini" "p2" "configuration")
|
||||||
|
|
||||||
|
run_reconciler=/var/lib/rpm-state/eclipse/run-reconciler
|
||||||
|
|
||||||
# If the reconciler was run with the -clean options rerun the initializer.
|
# If the reconciler was run with the -clean options rerun the initializer.
|
||||||
if [[ "$@" == *-clean* ]]
|
if [[ "$@" == *-clean* ]]
|
||||||
then
|
then
|
||||||
@ -16,7 +18,7 @@ then
|
|||||||
exit 0;
|
exit 0;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -e /var/run/eclipse/run-reconciler ] && [[ "$@" != *-Dosgi.checkConfiguration=true* ]]
|
if [ ! -e $run_reconciler ] && [[ "$@" != *-Dosgi.checkConfiguration=true* ]]
|
||||||
then
|
then
|
||||||
echo "run-reconciler file not present. No need to run the reconciler"
|
echo "run-reconciler file not present. No need to run the reconciler"
|
||||||
exit 0
|
exit 0
|
||||||
@ -33,7 +35,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Removing run-reconciler file"
|
echo "Removing run-reconciler file"
|
||||||
rm -f /var/run/eclipse/run-reconciler
|
rm -f $run_reconciler
|
||||||
|
|
||||||
# if we are running the reconciler with -Dosgi.checkConfiguration=true
|
# if we are running the reconciler with -Dosgi.checkConfiguration=true
|
||||||
# probably doing an upgrade remove time stamp file(s).
|
# probably doing an upgrade remove time stamp file(s).
|
||||||
|
@ -1 +0,0 @@
|
|||||||
D /var/run/eclipse 0710 root root -
|
|
30
eclipse.spec
30
eclipse.spec
@ -17,14 +17,13 @@ Epoch: 1
|
|||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||||
Release: 14%{?dist}
|
Release: 15%{?dist}
|
||||||
License: EPL
|
License: EPL
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
Source0: %{download_url}eclipse-build-%{eb_sha1}.tar.xz
|
Source0: %{download_url}eclipse-build-%{eb_sha1}.tar.xz
|
||||||
Source1: %{download_url}eclipse-3.7.1-src.tar.bz2
|
Source1: %{download_url}eclipse-3.7.1-src.tar.bz2
|
||||||
Source2: eclipse-reconciler.sh
|
Source2: eclipse-reconciler.sh
|
||||||
Source3: %{name}-tmpfiles.conf
|
|
||||||
Source4: macros.%{name}
|
Source4: macros.%{name}
|
||||||
Source5: http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/3.6.0.v20100517/org.eclipse.osgi-3.6.0.v20100517.pom
|
Source5: http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/3.6.0.v20100517/org.eclipse.osgi-3.6.0.v20100517.pom
|
||||||
# Fetched from http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi.services/3.2.100.v20100503/org.eclipse.osgi.services-3.2.100.v20100503.pom
|
# Fetched from http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi.services/3.2.100.v20100503/org.eclipse.osgi.services-3.2.100.v20100503.pom
|
||||||
@ -306,13 +305,9 @@ PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \
|
|||||||
sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \
|
sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \
|
||||||
$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
|
$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
|
||||||
|
|
||||||
# Install tmpfs file
|
# Install temporary directory file
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d/
|
mkdir -p %{buildroot}%{_localstatedir}/lib/rpm-state/%{name}
|
||||||
install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
|
install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}
|
||||||
|
|
||||||
# Install tmpfs dir
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/run/
|
|
||||||
install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/
|
|
||||||
|
|
||||||
# Install eclipse macros file
|
# Install eclipse macros file
|
||||||
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
|
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
|
||||||
@ -377,10 +372,10 @@ fi
|
|||||||
# this point, and there is no need to.
|
# this point, and there is no need to.
|
||||||
|
|
||||||
%post jdt
|
%post jdt
|
||||||
touch /var/run/eclipse/run-reconciler
|
touch /var/lib/rpm-state/eclipse/run-reconciler
|
||||||
|
|
||||||
%postun jdt
|
%postun jdt
|
||||||
touch /var/run/eclipse/run-reconciler
|
touch /var/lib/rpm-state/eclipse/run-reconciler
|
||||||
|
|
||||||
if [ $1 == 0 ]; then
|
if [ $1 == 0 ]; then
|
||||||
eclipse-reconciler.sh > /dev/null
|
eclipse-reconciler.sh > /dev/null
|
||||||
@ -390,10 +385,10 @@ fi
|
|||||||
eclipse-reconciler.sh > /dev/null
|
eclipse-reconciler.sh > /dev/null
|
||||||
|
|
||||||
%post pde
|
%post pde
|
||||||
touch /var/run/eclipse/run-reconciler
|
touch /var/lib/rpm-state/eclipse/run-reconciler
|
||||||
|
|
||||||
%postun pde
|
%postun pde
|
||||||
touch /var/run/eclipse/run-reconciler
|
touch /var/lib/rpm-state/eclipse/run-reconciler
|
||||||
|
|
||||||
if [ $1 == 0 ]; then
|
if [ $1 == 0 ]; then
|
||||||
eclipse-reconciler.sh > /dev/null
|
eclipse-reconciler.sh > /dev/null
|
||||||
@ -485,8 +480,8 @@ rm -rf %{_bindir}/efj/
|
|||||||
%{_libdir}/%{name}/about_files
|
%{_libdir}/%{name}/about_files
|
||||||
%endif
|
%endif
|
||||||
%{_sysconfdir}/rpm/macros.%{name}
|
%{_sysconfdir}/rpm/macros.%{name}
|
||||||
%dir %{_localstatedir}/run/%{name}/
|
%dir %{_localstatedir}/lib/rpm-state
|
||||||
%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
|
%dir %{_localstatedir}/lib/rpm-state/%{name}
|
||||||
%{_datadir}/applications/*
|
%{_datadir}/applications/*
|
||||||
%{_datadir}/pixmaps/*
|
%{_datadir}/pixmaps/*
|
||||||
%{_datadir}/icons/*/*/apps/*
|
%{_datadir}/icons/*/*/apps/*
|
||||||
@ -646,7 +641,10 @@ rm -rf %{_bindir}/efj/
|
|||||||
%{_libdir}/%{name}/buildscripts
|
%{_libdir}/%{name}/buildscripts
|
||||||
%{_libdir}/%{name}/dropins/sdk
|
%{_libdir}/%{name}/dropins/sdk
|
||||||
|
|
||||||
%changelog
|
%changelog* Tue Jan 19 2012 Sami Wagiaalla <swagiaal@redhat.com> 1:3.7.1-15
|
||||||
|
- Use rpm-state/eclipse for run-reconciler file instead of /var/run.
|
||||||
|
- Delete eclipse-tmpfiles.conf.
|
||||||
|
|
||||||
* Mon Jan 19 2012 Sami Wagiaalla <swagiaal@redhat.com> 1:3.7.1-14
|
* Mon Jan 19 2012 Sami Wagiaalla <swagiaal@redhat.com> 1:3.7.1-14
|
||||||
- Remove _eclipse_pkg macro.
|
- Remove _eclipse_pkg macro.
|
||||||
- Use mktemp for creating a backup directory in eclipse-reconciler.sh
|
- Use mktemp for creating a backup directory in eclipse-reconciler.sh
|
||||||
|
@ -2,10 +2,10 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
%_eclipse_pkg_post \
|
%_eclipse_pkg_post \
|
||||||
touch /var/run/eclipse/run-reconciler
|
touch /var/lib/rpm-state/eclipse/run-reconciler
|
||||||
|
|
||||||
%_eclipse_pkg_postun \
|
%_eclipse_pkg_postun \
|
||||||
touch /var/run/eclipse/run-reconciler \
|
touch /var/lib/rpm-state/eclipse/run-reconciler \
|
||||||
\
|
\
|
||||||
if [ $1 == 0 ]; then \
|
if [ $1 == 0 ]; then \
|
||||||
eclipse-reconciler.sh > /dev/null \
|
eclipse-reconciler.sh > /dev/null \
|
||||||
|
Loading…
Reference in New Issue
Block a user