From 044ba35b79ce19b691496375c27828c6e24338e97465263f4ca28f5ff2ec445c Mon Sep 17 00:00:00 2001 From: Pascal Bleser Date: Fri, 29 May 2009 00:00:19 +0000 Subject: [PATCH] 1.4.0 OBS-URL: https://build.opensuse.org/package/show/filesystems/davfs2?expand=0&rev=2 --- compile-error-open.patch | 12 ------ davfs2-1.2.2.tar.gz | 3 -- davfs2-1.3.3.tar.gz | 3 -- davfs2-1.4.0.tar.bz2 | 3 ++ fuse-davfs2.spec => davfs2.spec | 71 ++++++++++++++++++--------------- 5 files changed, 41 insertions(+), 51 deletions(-) delete mode 100644 compile-error-open.patch delete mode 100644 davfs2-1.2.2.tar.gz delete mode 100644 davfs2-1.3.3.tar.gz create mode 100644 davfs2-1.4.0.tar.bz2 rename fuse-davfs2.spec => davfs2.spec (56%) diff --git a/compile-error-open.patch b/compile-error-open.patch deleted file mode 100644 index 129cd88..0000000 --- a/compile-error-open.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN davfs2-1.3.3/src/webdav.c davfs2-1.3.3.leo//src/webdav.c ---- davfs2-1.3.3/src/webdav.c 2008-06-28 19:20:07.000000000 +0200 -+++ davfs2-1.3.3.leo//src/webdav.c 2009-01-14 17:02:32.000000000 +0100 -@@ -1513,7 +1513,7 @@ - - get_context *ctx = (get_context *) userdata; - if (ctx->fd == 0) -- ctx->fd = open(ctx->file, O_WRONLY | O_CREAT | O_TRUNC); -+ ctx->fd = open(ctx->file, O_WRONLY | O_TRUNC, S_IRUSR | S_IWUSR); - if (ctx->fd <= 0) { - ne_set_error(session, _("%i can't open cache file"), 0); - ctx->error = EIO; diff --git a/davfs2-1.2.2.tar.gz b/davfs2-1.2.2.tar.gz deleted file mode 100644 index 2a75593..0000000 --- a/davfs2-1.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21baf6dc63ab2f7a7df82b53baefe827e2b3bc833d41ed2fff2c60f3721da005 -size 391971 diff --git a/davfs2-1.3.3.tar.gz b/davfs2-1.3.3.tar.gz deleted file mode 100644 index 4bc7411..0000000 --- a/davfs2-1.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb71b46dfd6b24885c263243cdf15de57d4798b6cee0b479324ea387f3694775 -size 407659 diff --git a/davfs2-1.4.0.tar.bz2 b/davfs2-1.4.0.tar.bz2 new file mode 100644 index 0000000..dc848d4 --- /dev/null +++ b/davfs2-1.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e47edb66e5112bad278437c30a3b4f981f3064aaf3d094caa5c5109dd9ae494 +size 304475 diff --git a/fuse-davfs2.spec b/davfs2.spec similarity index 56% rename from fuse-davfs2.spec rename to davfs2.spec index 4829e29..1a9dd5c 100644 --- a/fuse-davfs2.spec +++ b/davfs2.spec @@ -1,26 +1,19 @@ -%define real_name davfs2 -%define _prefix /usr - Summary: FUSE-Filesystem to access WebDAV servers -Name: fuse-davfs2 -Version: 1.3.3 -Release: 1 -License: GPL -Group: System Environment/Kernel -Packager: Leo Eraly -URL: http://dav.sourceforge.net/ - -Source: http://dl.sf.net/dav/davfs2-%{version}.tar.gz +Name: davfs2 +Version: 1.4.0 +Release: 0 +License: GNU General Public License version 3 (GPL v3) +Group: System/Filesystems +URL: http://savannah.nongnu.org/projects/davfs2 +# http://mirrors.zerg.biz/nongnu/davfs2/davfs2-%{version}.tar.gz +Source: davfs2-%{version}.tar.bz2 Source1: davfs.easy Source2: davfs.secure -Patch: compile-error-open.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - BuildRequires: fuse-devel >= 2.2, neon-devel Requires: fuse >= 2.2 - -Obsoletes: davfs2 <= %{version} -Provides: davfs2 = %{version} +Obsoletes: fuse-davfs2 <= %{version} +Provides: fuse-davfs2 = %{version} %description davfs2 is a FUSE file system driver that allows you to mount a WebDAV server @@ -33,33 +26,37 @@ systems. To connect to the WebDAV server it makes use of the neon library. Neon supports TLS/SSL (using OpenSSL or GnuTLS) and access via proxy server. %prep -%setup -n %{real_name}-%{version} -%patch -p1 +%setup -q -n "davfs2-%{version}" %build -%configure \ - --disable-static -%{__make} +ssbindir="%{_sbindir}" \ +%configure --disable-static +%__make %{?jobs:-j%{jobs}} %install -%{__make} install DESTDIR="%{buildroot}" +%makeinstall +%__rm -rf "%{buildroot}%{_datadir}/doc" -%{__mkdir} -p "%{buildroot}/%{_sysconfdir}/permissions.d" -%{__install} -D -m0644 %{SOURCE1} "%{buildroot}/%{_sysconfdir}/permissions.d/" -%{__install} -D -m0644 %{SOURCE2} "%{buildroot}/%{_sysconfdir}/permissions.d/" +%__install -d "%{buildroot}/%{_sysconfdir}/permissions.d" +%__install -m0644 "%{SOURCE1}" "%{SOURCE2}" "%{buildroot}/%{_sysconfdir}/permissions.d/" -%find_lang %{real_name} +%__install -d "%{buildroot}/var/cache/davfs2" +%find_lang davfs2 ### Clean up buildroot -%{__rm} -rf %{buildroot}%{_docdir} +%__rm -rf "%{buildroot}%{_docdir}" %clean -%{__rm} -rf %{buildroot} +%__rm -rf "%{buildroot}" -%files -f %{real_name}.lang +%post +/usr/bin/getent group davfs2 >/dev/null 2>&1 || /usr/sbin/groupadd -r davfs2 +/usr/bin/getent passwd davfs2 >/dev/null 2>&1 || /usr/sbin/useradd -r -g davfs2 -d /var/cache/davfs2 davfs2 + +%files -f davfs2.lang %defattr(-, root, root, 0755) -%doc AUTHORS BUGS COPYING FAQ INSTALL NEWS README* THANKS TODO etc/davfs2.conf etc/secrets +%doc AUTHORS BUGS COPYING FAQ NEWS README* THANKS TODO etc/davfs2.conf etc/secrets %dir %{_sysconfdir}/davfs2/ %doc %{_mandir}/man5/davfs2.conf.5* %doc %{_mandir}/man8/mount.davfs.8* @@ -74,12 +71,20 @@ Neon supports TLS/SSL (using OpenSSL or GnuTLS) and access via proxy server. %config %{_sysconfdir}/davfs2/certs/ %{_sbindir}/mount.davfs %{_sbindir}/umount.davfs -%{_datadir}/davfs2/ -%exclude %{_prefix}/share/doc/%{real_name}/* +%{_datadir}/davfs2 +%attr(0750, davfs2, davfs2) /var/cache/davfs2 %exclude /sbin/mount.davfs %exclude /sbin/umount.davfs %changelog +* Fri May 29 2009 Pascal Bleser - 1.4.0 +- copied into filesystems repository in openSUSE Build Service, original in home:leo_eraly +- fix license tag +- added %%post script to create davfs2 group and user +- moved to Savannah +- some spec file tidying +- update to 1.4.0 + * Wed Jan 14 2009 Leo Eraly - 1.3.3-1 - Update to release - Added permissions file (fixes rpmlint error)