Changes - SailfishOS Open Build Service

Changes of Revision 5

[-] [+]	Added	_service:tar_git:davfs2.spec
@@ -0,0 +1,118 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.32 +# + +Name: davfs2 + +# >> macros +# << macros +%define dav_group mount +%define dav_user mount +%define dav_cachedir /home/.system/var/cache/%{name} + +Summary: Linux FUSE driver that allows you to mount a WebDAV resource +Version: 1.6.1 +Release: 0 +Group: System +License: GPLv3+ +URL: https://savannah.nongnu.org/projects/davfs2/ +Source0: https://download.savannah.nongnu.org/releases/davfs2/%{name}-%{version}.tar.gz +Source1: davfs2-rpmlintrc +Source100: davfs2.yaml +Patch0: Makefile.am.patch +Patch1: filelocations.patch +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libproxy-1.0) +BuildRequires: pkgconfig(libssl) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(neon) +BuildRequires: pkgconfig(zlib) +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gettext + +%description +davfs2 is a Linux file system driver that allows you to mount a WebDAV +resource into your Unix file system tree. So - and that is what makes +davfs2 different - applications can use it without knowing about WebDAV. +You may edit WebDAV resources using standard applications that interact +with the file system as usual. + +davfs2 supports SSL and proxy, HTTP authentication (basic and digest) +and client certificates. +%if "%{?vendor}" == "chum" +PackageName: davfs2 +Type: console-application +Custom: + PackagingRepo: https://github.com/sailfishos-chum/davfs2 +Categories: + - Network + - Filesystem +%endif + + +%prep +%setup -q -n %{name}-%{version}/upstream/ + +# Makefile.am.patch +%patch0 -p1 +# filelocations.patch +%patch1 -p1 +# >> setup +# << setup + +%build +# >> build pre +# set the user/group in the system config file. note that this needs the patch above +sed -i "s#@@rpm_dav_user@@#%{dav_user}#" etc/davfs2.conf +sed -i "s#@@rpm_dav_group@@#%{dav_group}#" etc/davfs2.conf +sed -i "s#@@rpm_dav_cachedir@@#%{dav_cachedir}#" etc/davfs2.conf +# commands from ./bootstrap, but without the gettext and gnulib stuff +rm config/gnulib-cache.m4 +autopoint --force +aclocal -I config +autoheader +automake --add-missing --force-missing --copy +autoconf +cp -p config/COPYING.davfs2 COPYING +cp -p config/INSTALL.davfs2 INSTALL +# << build pre + +%configure --disable-static \ + --enable-largefile \ + --disable-nls \ + dav_group=%{dav_group} \ + dav_user=%{dav_user} \ + dav_syscachedir=%{dav_cachedir} + +make %{?_smp_mflags} + +# >> build post +# << build post + +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%make_install + +# >> install post +install -d -m 755 %{buildroot}%{dav_cachedir} +# we don't need the docs +rm -rf %{buildroot}%{_mandir} +rm -rf %{buildroot}%{_docdir}/%{name} +# << install post + +%files +%defattr(-,root,root,-) +/sbin/* +%{_sbindir}/* +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%config(noreplace) %{_sysconfdir}/%{name}/secrets +%dir %{_sysconfdir}/%{name}/certs +%{_datadir}/%{name} +%{dav_cachedir} +# >> files +# << files
[-] [+]	Deleted	davfs2.spec ^
@@ -1,114 +0,0 @@ -# -# Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.32 -# - -Name: davfs2 - -# >> macros -# << macros -%define dav_group mount -%define dav_user mount -%define dav_cachedir /home/.system/var/cache/%{name} - -Summary: Linux FUSE driver that allows you to mount a WebDAV resource -Version: 1.6.1 -Release: 0 -Group: System -License: GPLv3+ -URL: https://savannah.nongnu.org/projects/davfs2/ -Source0: https://download.savannah.nongnu.org/releases/davfs2/%{name}-%{version}.tar.gz -Source1: davfs2-rpmlintrc -Source100: davfs2.yaml -Patch0: filelocations.patch -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(libcrypto) -BuildRequires: pkgconfig(libproxy-1.0) -BuildRequires: pkgconfig(libssl) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(neon) -BuildRequires: pkgconfig(zlib) - -%description -davfs2 is a Linux file system driver that allows you to mount a WebDAV -resource into your Unix file system tree. So - and that is what makes -davfs2 different - applications can use it without knowing about WebDAV. -You may edit WebDAV resources using standard applications that interact -with the file system as usual. - -davfs2 supports SSL and proxy, HTTP authentication (basic and digest) -and client certificates. -%if "%{?vendor}" == "chum" -PackageName: davfs2 -PackagerName: nephros -Type: console-application -Categories: - - Network - - System -%endif - - -%package doc -Summary: Documentation for %{name} -Group: Documentation -BuildArch: noarch - -%description doc -%{summary}. - -%prep -%setup -q -n %{name}-%{version} - -# filelocations.patch -%patch0 -p1 -# >> setup -# << setup - -%build -# >> build pre -# set the user/group in the system config file. note that this needs the patch above -sed -i "s#@@rpm_dav_user@@#%{dav_user}#" etc/davfs2.conf -sed -i "s#@@rpm_dav_group@@#%{dav_group}#" etc/davfs2.conf -sed -i "s#@@rpm_dav_cachedir@@#%{dav_cachedir}#" etc/davfs2.conf -# << build pre - -%configure --disable-static \ - --enable-largefile \ - --disable-nls \ - dav_group=%{dav_group} \ - dav_user=%{dav_user} \ - dav_syscachedir=%{dav_cachedir} - -make %{?_smp_mflags} - -# >> build post -# << build post - -%install -rm -rf %{buildroot} -# >> install pre -# << install pre -%make_install - -# >> install post -install -d -m 755 %{buildroot}%{dav_cachedir} -# << install post - -%files -%defattr(-,root,root,-) -/sbin/* -%{_sbindir}/* -%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf -%config(noreplace) %{_sysconfdir}/%{name}/secrets -%{_sysconfdir}/%{name}/certs -%{_datadir}/%{name} -%{dav_cachedir} -# >> files -# << files - -%files doc -%defattr(-,root,root,-) -%{_mandir}// -%{_docdir}/%{name} -# >> files doc -# << files doc
[-] [+]	Added	_service:tar_git:Makefile.am.patch ^
@@ -0,0 +1,16 @@ +diff --git a/Makefile.am b/Makefile.am +index 66d757b..cd07035 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -20,9 +20,8 @@ + ## Process this file with automake to produce Makefile.in + + EXTRA_DIST = bootstrap BUGS FAQ README.translators \ +- config/COPYING.davfs2 config/INSTALL.davfs2 \ +- config/gnulib-cache.m4 +-SUBDIRS = gl glpo po etc man src ++ config/COPYING.davfs2 config/INSTALL.davfs2 ++SUBDIRS = po etc src + ACLOCAL_AMFLAGS = -I config + doc_DATA = AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README \ + README.translators THANKS TODO
[-] [+]	Added	_service:tar_git:filelocations.patch ^
@@ -0,0 +1,32 @@ +--- a/etc/davfs2.conf 2021-09-07 09:43:10.866883040 +0200 ++++ b/etc/davfs2.conf 2021-09-07 09:45:33.052233527 +0200 +@@ -19,8 +19,8 @@ + # General Options + # --------------- + +-# dav_user davfs2 # system wide config file only +-# dav_group davfs2 # system wide config file only ++dav_user @@rpm_dav_user@@ # system wide config file only ++dav_group @@rpm_dav_group@@ # system wide config file only + # buf_size 16 # KiByte + + # WebDAV Related Options +@@ -32,7 +32,7 @@ + # servercert # deprecated: use trust_ca_cert + # trust_server_cert + # clientcert +-# secrets ~/.davfs2/secrets # user config file only ++# secrets ~/.config/davfs2/secrets # user config file only + # ask_auth 1 + # use_locks 1 + # lock_owner <user-name> +@@ -60,7 +60,8 @@ + + # backup_dir lost+found + # cache_dir /var/cache/davfs2 # system wide cache +-# ~/.davfs2/cache # per user cache ++cache_dir @@rpm_dav_cachedir@@ # system wide cache ++# cache_dir ~/.cache/davfs2 # per user cache + # cache_size 50 # MiByte + # table_size 1024 + # dir_refresh 60 # seconds
[-] [+]	Deleted	filelocations.patch ^
@@ -1,32 +0,0 @@ ---- a/etc/davfs2.conf 2021-09-07 09:43:10.866883040 +0200 -+++ b/etc/davfs2.conf 2021-09-07 09:45:33.052233527 +0200 -@@ -19,8 +19,8 @@ - # General Options - # --------------- - --# dav_user davfs2 # system wide config file only --# dav_group davfs2 # system wide config file only -+dav_user @@rpm_dav_user@@ # system wide config file only -+dav_group @@rpm_dav_group@@ # system wide config file only - # buf_size 16 # KiByte - - # WebDAV Related Options -@@ -32,7 +32,7 @@ - # servercert # deprecated: use trust_ca_cert - # trust_server_cert - # clientcert --# secrets ~/.davfs2/secrets # user config file only -+# secrets ~/.config/davfs2/secrets # user config file only - # ask_auth 1 - # use_locks 1 - # lock_owner <user-name> -@@ -60,7 +60,8 @@ - - # backup_dir lost+found - # cache_dir /var/cache/davfs2 # system wide cache --# ~/.davfs2/cache # per user cache -+cache_dir @@rpm_dav_cachedir@@ # system wide cache -+# cache_dir ~/.cache/davfs2 # per user cache - # cache_size 50 # MiByte - # table_size 1024 - # dir_refresh 60 # seconds
[-] [+]	Added	_service ^
@@ -0,0 +1,10 @@ +<services> + <service name="tar_git"> + <param name="url">https://github.com/sailfishos-chum/davfs2</param> + <param name="branch"></param> + <param name="revision">1.6.1</param> + <param name="token"/> + <param name="debian">N</param> + <param name="dumb">N</param> + </service> +</services>
	Added	_service:tar_git:davfs2-1.6.1.tar.gz ^
[-] [+]	Added	_service:tar_git:davfs2-rpmlintrc ^
@@ -0,0 +1,7 @@ +# user-called mount programs are setuid, that's how they work... +addFilter("davfs2.* setuid-binary /usr/sbin/mount.davfs root 4755") +addFilter("davfs2.* non-standard-executable-perm /usr/sbin/mount.davfs 4755") +addFilter("davfs2.* non-standard-dir-perm /etc/davfs2/certs/private 700") +addFilter("davfs2.* non-readable /etc/davfs2/secrets 600") +# see comments in yaml file on why we use /home +addFilter("davfs2.* dir-or-file-in-home /home/.system/var/cache/davfs2.*")
[-] [+]	Added	_service:tar_git:davfs2.yaml ^
@@ -0,0 +1,84 @@ +Name: davfs2 +Summary: Linux FUSE driver that allows you to mount a WebDAV resource +Version: 1.6.1 +Release: 0 +Group: System +License: GPLv3+ +URL: 'https://savannah.nongnu.org/projects/davfs2/' +SCM: 'https://git.savannah.nongnu.org/git/davfs2.git' +Sources: + - 'https://download.savannah.nongnu.org/releases/davfs2/%{name}-%{version}.tar.gz' + - 'davfs2-rpmlintrc' +Patches: + # patch Makefile.am: + # bootstrap uses gnulib-tool, and po4a which we both don't have ATM + # also, we don't need documentation anyway on Sailfish OS + - 'Makefile.am.patch' + # patch the config file so we can later sed-mangle the locations in the .spec + - 'filelocations.patch' +Description: \| + davfs2 is a Linux file system driver that allows you to mount a WebDAV + resource into your Unix file system tree. So - and that is what makes + davfs2 different - applications can use it without knowing about WebDAV. + You may edit WebDAV resources using standard applications that interact + with the file system as usual. + + davfs2 supports SSL and proxy, HTTP authentication (basic and digest) + and client certificates. + %if "%{?vendor}" == "chum" + PackageName: davfs2 + Type: console-application + Categories: + - Network + - Filesystem + Custom: + PackagingRepo: https://github.com/sailfishos-chum/davfs2 + Url: + Help: http://savannah.nongnu.org/userguide/ + %endif +#Requires: +PkgBR: + - autoconf + - automake + - gettext +### make sure all deps of neon are included here, otherwise configure will say the version is incompatible +PkgConfigBR: + - dbus-1 + - libcrypto + - libproxy-1.0 + - libssl + - libxml-2.0 + - neon + - zlib +Macros: + - 'dav_group;mount' + - 'dav_user;mount' + # these are files cached in the plain from some remote server. + # we put it in /home so they are encrypted and not leakred in the default /var/cache + - 'dav_cachedir;/home/.system/var/cache/%{name}' +SetupOptions: -q -n %{name}-%{version}/upstream/ +ConfigOptions: + - '--enable-largefile' + - '--disable-nls' + - 'dav_group=%{dav_group}' + - 'dav_user=%{dav_user}' + - 'dav_syscachedir=%{dav_cachedir}' + +Files: + # is there a macro for /sbin? + - '/sbin/' + - '%{_sbindir}/' + - '%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf' + - '%config(noreplace) %{_sysconfdir}/%{name}/secrets' + - '%dir %{_sysconfdir}/%{name}/certs' + - '%{_datadir}/%{name}' + - '%{dav_cachedir}' +#SubPackages: +# - Name: doc +# Summary: Documentation for %{name} +# Group: Documentation +# BuildArch: noarch +# AutoDepend: false +# Files: +# - '%{_mandir}//' +# - '%{_docdir}/%{name}'
	Deleted	davfs2-1.6.1.tar.gz ^
[-] [+]	Deleted	davfs2-rpmlintrc ^
@@ -1,7 +0,0 @@ -# user-called mount programs are setuid, that's how they work... -addFilter("davfs2.* setuid-binary /usr/sbin/mount.davfs root 4755") -addFilter("davfs2.* non-standard-executable-perm /usr/sbin/mount.davfs 4755") -addFilter("davfs2.* non-standard-dir-perm /etc/davfs2/certs/private 700") -addFilter("davfs2.* non-readable /etc/davfs2/secrets 600") -# see comments in yaml file on why we use /home -addFilter("davfs2.* dir-or-file-in-home /home/.system/var/cache/davfs2.*")
[-] [+]	Deleted	davfs2.yaml ^
@@ -1,71 +0,0 @@ -Name: davfs2 -Summary: Linux FUSE driver that allows you to mount a WebDAV resource -Version: 1.6.1 -Release: 0 -Group: System -License: GPLv3+ -URL: 'https://savannah.nongnu.org/projects/davfs2/' -Sources: - - 'https://download.savannah.nongnu.org/releases/davfs2/%{name}-%{version}.tar.gz' - - 'davfs2-rpmlintrc' -Patches: - - 'filelocations.patch' -Description: \| - davfs2 is a Linux file system driver that allows you to mount a WebDAV - resource into your Unix file system tree. So - and that is what makes - davfs2 different - applications can use it without knowing about WebDAV. - You may edit WebDAV resources using standard applications that interact - with the file system as usual. - - davfs2 supports SSL and proxy, HTTP authentication (basic and digest) - and client certificates. - %if "%{?vendor}" == "chum" - PackageName: davfs2 - PackagerName: nephros - Type: console-application - Categories: - - Network - - System - %endif -#Requires: -#PkgBR: -### make sure all deps of neon are included here, otherwise configure will say the version is incompatible -PkgConfigBR: - - dbus-1 - - libcrypto - - libproxy-1.0 - - libssl - - libxml-2.0 - - neon - - zlib -Macros: - - 'dav_group;mount' - - 'dav_user;mount' - # these are files cached in the plain from some remote server. - # we put it in /home so they are encrypted and not leakred in the default /var/cache - - 'dav_cachedir;/home/.system/var/cache/%{name}' -ConfigOptions: - - '--enable-largefile' - - '--disable-nls' - - 'dav_group=%{dav_group}' - - 'dav_user=%{dav_user}' - - 'dav_syscachedir=%{dav_cachedir}' - -Files: - # is there a macro for /sbin? - - '/sbin/' - - '%{_sbindir}/' - - '%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf' - - '%config(noreplace) %{_sysconfdir}/%{name}/secrets' - - '%{_sysconfdir}/%{name}/certs' - - '%{_datadir}/%{name}' - - '%{dav_cachedir}' -SubPackages: - - Name: doc - Summary: Documentation for %{name} - Group: Documentation - BuildArch: noarch - AutoDepend: false - Files: - - '%{_mandir}//' - - '%{_docdir}/%{name}'