rpms/vdr/devel vdr.spec,1.54,1.55

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7916

Modified Files:
	vdr.spec 
Log Message:
* Sun Mar  7 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-31
- Drop data migration from %post (was for upgrades from < 1.6.0-15).



Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- vdr.spec	21 Feb 2010 19:42:39 -0000	1.54
+++ vdr.spec	7 Mar 2010 19:55:48 -0000	1.55
@@ -34,7 +34,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        30%{?dist}
+Release:        31%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -453,24 +453,6 @@ useradd -r -g %{vdr_group} -d %{vardir} 
 :
 
 %post
-# Migrate stuff in vardir, videodir when upgrading from pre 1.6.0-15 (#443706)
-# TODO: to be removed in F-13
-if [ $1 -gt 1 -a -d /srv/vdr ] ; then
-
-    # Continue to use /srv/vdr as the video dir for old setups
-    f=%{_sysconfdir}/sysconfig/vdr
-    if ! grep -q '^\s*VDR_OPTIONS.*[( ]-v' $f ; then
-        sed -i -e 's|^\(\s*VDR_OPTIONS.*(\)\(.*\)|\1-v /srv/vdr \2|' $f
-    fi
-
-    # Move stuff previously in /var/lib/vdr to /var/lib/vdr/data
-    for f in $(find %{varbase} -mindepth 1 -maxdepth 1 -not -name data -not -name "video*") ; do
-        mv $f %{vardir}
-    done
-
-    # Set new home dir
-    usermod -d %{vardir} %{vdr_user} 2>/dev/null
-fi
 /sbin/chkconfig --add vdr || :
 
 %preun
@@ -564,6 +546,9 @@ fi
 %endif # plugins
 
 %changelog
+* Sun Mar  7 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-31
+- Drop data migration from %%post (was for upgrades from < 1.6.0-15).
+
 * Sun Feb 21 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-30
 - Do sudoers config with sudoers.d (sudo >= 1.7.2p2-3).