rpms/prelink/devel prelink.cron,1.5,1.6 prelink.spec,1.66,1.67

[Jakub Jelinek]

Author: jakub

Update of /cvs/pkgs/rpms/prelink/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30841

Modified Files:
	prelink.cron prelink.spec 
Log Message:
prelink-0.4.3-3


Index: prelink.cron
===================================================================
RCS file: /cvs/pkgs/rpms/prelink/devel/prelink.cron,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- prelink.cron	21 Jun 2006 10:07:33 -0000	1.5
+++ prelink.cron	23 Apr 2010 14:41:50 -0000	1.6
@@ -16,30 +16,30 @@ if [ "$PRELINKING" != yes ]; then
   exit 0
 fi
 
-if [ ! -f /etc/prelink.cache -o -f /var/lib/misc/prelink.force ] \
+if [ ! -f /etc/prelink.cache -o -f /var/lib/prelink/force ] \
    || grep -q '^prelink-ELF0.[0-2]' /etc/prelink.cache; then
   # If cache does not exist or is from older prelink versions or
   # if we were asked to explicitely, force full prelinking
-  rm -f /etc/prelink.cache /var/lib/misc/prelink.force
+  rm -f /etc/prelink.cache /var/lib/prelink/force
   PRELINK_OPTS="$PRELINK_OPTS -f"
-  date > /var/lib/misc/prelink.full
-  cp -a /var/lib/misc/prelink.{full,quick}
+  date > /var/lib/prelink/full
+  cp -a /var/lib/prelink/{full,quick}
 elif [ -n "$PRELINK_FULL_TIME_INTERVAL" \
-       -a "`find /var/lib/misc/prelink.full -mtime -${PRELINK_FULL_TIME_INTERVAL} 2>/dev/null`" \
-	  = /var/lib/misc/prelink.full ]; then
+       -a "`find /var/lib/prelink/full -mtime -${PRELINK_FULL_TIME_INTERVAL} 2>/dev/null`" \
+	  = /var/lib/prelink/full ]; then
   # If no more than PRELINK_NONRPM_CHECK_INTERVAL days elapsed from last prelink
   # (be it full or quick) and no packages have been upgraded via rpm since then,
   # don't do anything.
-  [ "`find /var/lib/misc/prelink.quick -mtime -${PRELINK_NONRPM_CHECK_INTERVAL:-7} 2>/dev/null`" \
+  [ "`find /var/lib/prelink/quick -mtime -${PRELINK_NONRPM_CHECK_INTERVAL:-7} 2>/dev/null`" \
     -a -f /var/lib/rpm/Packages \
-    -a /var/lib/rpm/Packages -ot /var/lib/misc/prelink.quick ] && exit 0
-  date > /var/lib/misc/prelink.quick
+    -a /var/lib/rpm/Packages -ot /var/lib/prelink/quick ] && exit 0
+  date > /var/lib/prelink/quick
   # If prelink without -q has been run in the last
   # PRELINK_FULL_TIME_INTERVAL days, just use quick mode
   PRELINK_OPTS="$PRELINK_OPTS -q"
 else
-  date > /var/lib/misc/prelink.full
-  cp -a /var/lib/misc/prelink.{full,quick}
+  date > /var/lib/prelink/full
+  cp -a /var/lib/prelink/{full,quick}
 fi
 
 echo /usr/sbin/prelink -av $PRELINK_OPTS > /var/log/prelink/prelink.log


Index: prelink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelink/devel/prelink.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- prelink.spec	13 Apr 2010 18:50:17 -0000	1.66
+++ prelink.spec	23 Apr 2010 14:41:51 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: An ELF prelinking utility
 Name: prelink
 Version: 0.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 %define date 20100413
@@ -62,10 +62,10 @@ mkdir -p %{buildroot}%{_mandir}/man5
 echo '.so man8/prelink.8' > %{buildroot}%{_mandir}/man5/prelink.conf.5
 chmod 644 %{buildroot}%{_mandir}/man5/prelink.conf.5
 
-mkdir -p %{buildroot}/var/{lib/misc,log/prelink}
-touch %{buildroot}/var/lib/misc/prelink.full
-touch %{buildroot}/var/lib/misc/prelink.quick
-touch %{buildroot}/var/lib/misc/prelink.force
+mkdir -p %{buildroot}/var/{lib,log}/prelink
+touch %{buildroot}/var/lib/prelink/full
+touch %{buildroot}/var/lib/prelink/quick
+touch %{buildroot}/var/lib/prelink/force
 touch %{buildroot}/var/log/prelink/prelink.log
 
 #prelink wreaks havoc on sparc systems lets make sure its disabled by default there
@@ -74,8 +74,7 @@ sed -i -e 's|PRELINKING=yes|PRELINKING=n
 %endif
 
 %post
-touch /var/lib/misc/prelink.force
-[ -x /sbin/restorecon ] && /sbin/restorecon /var/lib/misc/prelink.force || :
+touch /var/lib/prelink/force
 
 %clean
 rm -rf %{buildroot}
@@ -93,13 +92,18 @@ rm -rf %{buildroot}
 %{_mandir}/man5/prelink.conf.5*
 %{_mandir}/man8/prelink.8*
 %{_mandir}/man8/execstack.8*
-%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/misc/prelink.full
-%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/misc/prelink.quick
-%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/misc/prelink.force
+%dir /var/lib/prelink
+%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/prelink/full
+%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/prelink/quick
+%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/prelink/force
 %dir /var/log/prelink
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
 
 %changelog
+* Fri Apr 23 2010 Jakub Jelinek <jakub at redhat.com> 0.4.3-3
+- move /var/lib/misc/prelink.{force,quick,full} to
+  /var/lib/prelink/{force,quick,full} (#584319)
+
 * Tue Apr 13 2010 Jakub Jelinek <jakub at redhat.com> 0.4.3-2
 - run restorecon on /var/lib/misc/prelink.force (#581959)