Sophie

Sophie

distrib > Mandriva > mes5 > i586 > by-pkgid > 2e1a0817daa15d42cec4b126afe40cd2 > files > 2

davfs2-1.3.3-1mdv2009.0.src.rpm

diff -Naur davfs2-1.3.2/man/de/Makefile.am davfs2-1.3.2.oden/man/de/Makefile.am
--- davfs2-1.3.2/man/de/Makefile.am	2007-12-26 12:57:56.000000000 -0500
+++ davfs2-1.3.2.oden/man/de/Makefile.am	2008-05-22 06:15:14.000000000 -0400
@@ -18,7 +18,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
-pkglocalstatedir = $(dav_localstatedir)/mount.davfs
+pkglocalstatedir = $(dav_localstatedir)/mount.davfs2
 pkgsyscachedir = $(dav_syscachedir)/@PACKAGE@
 mandir = $(datadir)/man
 manual5dir = $(mandir)/de/man5
@@ -27,7 +27,7 @@
 edit = sed \
        -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
        -e 's|@PACKAGE_STRING[@]|$(PACKAGE_STRING)|g' \
-       -e 's|@PROGRAM_NAME[@]|mount.davfs|g' \
+       -e 's|@PROGRAM_NAME[@]|mount.davfs2|g' \
        -e 's|@SYS_CONF_DIR[@]|$(pkgsysconfdir)|g' \
        -e 's|@SYS_RUN[@]|$(pkglocalstatedir)|g' \
        -e 's|@SYS_CACHE_DIR[@]|$(pkgsyscachedir)|g' \
diff -Naur davfs2-1.3.2/man/de/Makefile.in davfs2-1.3.2.oden/man/de/Makefile.in
--- davfs2-1.3.2/man/de/Makefile.in	2008-05-12 15:42:01.000000000 -0400
+++ davfs2-1.3.2.oden/man/de/Makefile.in	2008-05-22 06:14:34.000000000 -0400
@@ -190,7 +190,7 @@
 edit = sed \
        -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
        -e 's|@PACKAGE_STRING[@]|$(PACKAGE_STRING)|g' \
-       -e 's|@PROGRAM_NAME[@]|mount.davfs|g' \
+       -e 's|@PROGRAM_NAME[@]|mount.davfs2|g' \
        -e 's|@SYS_CONF_DIR[@]|$(pkgsysconfdir)|g' \
        -e 's|@SYS_RUN[@]|$(pkglocalstatedir)|g' \
        -e 's|@SYS_CACHE_DIR[@]|$(pkgsyscachedir)|g' \
diff -Naur davfs2-1.3.2/man/es/Makefile.am davfs2-1.3.2.oden/man/es/Makefile.am
--- davfs2-1.3.2/man/es/Makefile.am	2007-12-26 12:58:18.000000000 -0500
+++ davfs2-1.3.2.oden/man/es/Makefile.am	2008-05-22 06:15:19.000000000 -0400
@@ -18,7 +18,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
-pkglocalstatedir = $(dav_localstatedir)/mount.davfs
+pkglocalstatedir = $(dav_localstatedir)/mount.davfs2
 pkgsyscachedir = $(dav_syscachedir)/@PACKAGE@
 mandir = $(datadir)/man
 manual5dir = $(mandir)/es/man5
@@ -27,7 +27,7 @@
 edit = sed \
        -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
        -e 's|@PACKAGE_STRING[@]|$(PACKAGE_STRING)|g' \
-       -e 's|@PROGRAM_NAME[@]|mount.davfs|g' \
+       -e 's|@PROGRAM_NAME[@]|mount.davfs2|g' \
        -e 's|@SYS_CONF_DIR[@]|$(pkgsysconfdir)|g' \
        -e 's|@SYS_RUN[@]|$(pkglocalstatedir)|g' \
        -e 's|@SYS_CACHE_DIR[@]|$(pkgsyscachedir)|g' \
diff -Naur davfs2-1.3.2/man/es/Makefile.in davfs2-1.3.2.oden/man/es/Makefile.in
--- davfs2-1.3.2/man/es/Makefile.in	2008-05-12 15:42:01.000000000 -0400
+++ davfs2-1.3.2.oden/man/es/Makefile.in	2008-05-22 06:14:34.000000000 -0400
@@ -189,7 +189,7 @@
 edit = sed \
        -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
        -e 's|@PACKAGE_STRING[@]|$(PACKAGE_STRING)|g' \
-       -e 's|@PROGRAM_NAME[@]|mount.davfs|g' \
+       -e 's|@PROGRAM_NAME[@]|mount.davfs2|g' \
        -e 's|@SYS_CONF_DIR[@]|$(pkgsysconfdir)|g' \
        -e 's|@SYS_RUN[@]|$(pkglocalstatedir)|g' \
        -e 's|@SYS_CACHE_DIR[@]|$(pkgsyscachedir)|g' \
diff -Naur davfs2-1.3.2/man/Makefile.am davfs2-1.3.2.oden/man/Makefile.am
--- davfs2-1.3.2/man/Makefile.am	2007-12-26 12:56:32.000000000 -0500
+++ davfs2-1.3.2.oden/man/Makefile.am	2008-05-22 06:15:02.000000000 -0400
@@ -18,7 +18,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
-pkglocalstatedir = $(dav_localstatedir)/mount.davfs
+pkglocalstatedir = $(dav_localstatedir)/mount.davfs2
 pkgsyscachedir = $(dav_syscachedir)/@PACKAGE@
 mandir = $(datadir)/man
 manual5dir = $(mandir)/man5
@@ -29,7 +29,7 @@
 edit = sed \
        -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
        -e 's|@PACKAGE_STRING[@]|$(PACKAGE_STRING)|g' \
-       -e 's|@PROGRAM_NAME[@]|mount.davfs|g' \
+       -e 's|@PROGRAM_NAME[@]|mount.davfs2|g' \
        -e 's|@SYS_CONF_DIR[@]|$(pkgsysconfdir)|g' \
        -e 's|@SYS_RUN[@]|$(pkglocalstatedir)|g' \
        -e 's|@SYS_CACHE_DIR[@]|$(pkgsyscachedir)|g' \
diff -Naur davfs2-1.3.2/man/Makefile.in davfs2-1.3.2.oden/man/Makefile.in
--- davfs2-1.3.2/man/Makefile.in	2008-05-12 15:42:00.000000000 -0400
+++ davfs2-1.3.2.oden/man/Makefile.in	2008-05-22 06:14:34.000000000 -0400
@@ -203,7 +203,7 @@
 edit = sed \
        -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
        -e 's|@PACKAGE_STRING[@]|$(PACKAGE_STRING)|g' \
-       -e 's|@PROGRAM_NAME[@]|mount.davfs|g' \
+       -e 's|@PROGRAM_NAME[@]|mount.davfs2|g' \
        -e 's|@SYS_CONF_DIR[@]|$(pkgsysconfdir)|g' \
        -e 's|@SYS_RUN[@]|$(pkglocalstatedir)|g' \
        -e 's|@SYS_CACHE_DIR[@]|$(pkgsyscachedir)|g' \
diff -Naur davfs2-1.3.2/src/defaults.h davfs2-1.3.2.oden/src/defaults.h
--- davfs2-1.3.2/src/defaults.h	2008-02-02 17:22:19.000000000 -0500
+++ davfs2-1.3.2.oden/src/defaults.h	2008-05-22 06:14:34.000000000 -0400
@@ -31,7 +31,7 @@
 #define DAV_HOME "http://dav.sourceforge.net"
 
 /* File system type to be used with 'mount -t' and fstab. */
-#define DAV_FS_TYPE "davfs"
+#define DAV_FS_TYPE "davfs2"
 
 /* Mount options set by mount program in case of mounting by an
    ordinary user. */
diff -Naur davfs2-1.3.2/src/Makefile.am davfs2-1.3.2.oden/src/Makefile.am
--- davfs2-1.3.2/src/Makefile.am	2007-06-10 15:51:57.000000000 -0400
+++ davfs2-1.3.2.oden/src/Makefile.am	2008-05-22 06:14:34.000000000 -0400
@@ -19,7 +19,7 @@
 
 localedir = $(datadir)/locale
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
-pkglocalstatedir = $(dav_localstatedir)/mount.davfs
+pkglocalstatedir = $(dav_localstatedir)/mount.davfs2
 pkgsyscachedir = $(dav_syscachedir)/@PACKAGE@
 ssbindir = @ssbindir@
 
@@ -31,7 +31,7 @@
 umount_davfs_SOURCES = umount_davfs.c defaults.h
 
 AM_CFLAGS = -Wall
-DEFS = -DPROGRAM_NAME=\"mount.davfs\" \
+DEFS = -DPROGRAM_NAME=\"mount.davfs2\" \
        -DDAV_SYS_CONF_DIR=\"$(pkgsysconfdir)\" \
        -DDAV_SYS_RUN=\"$(pkglocalstatedir)\" \
        -DDAV_SYS_CACHE=\"$(pkgsyscachedir)\" \
diff -Naur davfs2-1.3.2/src/Makefile.in davfs2-1.3.2.oden/src/Makefile.in
--- davfs2-1.3.2/src/Makefile.in	2008-05-12 15:42:01.000000000 -0400
+++ davfs2-1.3.2.oden/src/Makefile.in	2008-05-22 06:14:34.000000000 -0400
@@ -85,7 +85,7 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DEFS = -DPROGRAM_NAME=\"mount.davfs\" \
+DEFS = -DPROGRAM_NAME=\"mount.davfs2\" \
        -DDAV_SYS_CONF_DIR=\"$(pkgsysconfdir)\" \
        -DDAV_SYS_RUN=\"$(pkglocalstatedir)\" \
        -DDAV_SYS_CACHE=\"$(pkgsyscachedir)\" \