Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[fuse] No need to package udev rules.
Default udev rules from systemd already contain rules
for fuse.
  • Loading branch information
jusa committed Mar 18, 2020
1 parent a77472f commit ce1abbf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 18 deletions.
5 changes: 0 additions & 5 deletions rpm/fuse-udev_rules.patch

This file was deleted.

19 changes: 6 additions & 13 deletions rpm/fuse.spec
Expand Up @@ -6,9 +6,8 @@ Group: System/Base
License: LGPLv2+
URL: http://fuse.sf.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: fuse-udev_rules.patch
Patch1: fuse-0001-More-parentheses.patch
Patch2: 200-backport_arm64_fuse_kernel_h_clean_includes.patch
Patch0: fuse-0001-More-parentheses.patch
Patch1: 200-backport_arm64_fuse_kernel_h_clean_includes.patch
Requires: which
Requires: fuse-common
BuildRequires: gettext-devel
Expand Down Expand Up @@ -48,17 +47,9 @@ Requires: %{name} = %{version}-%{release}
Man pages for %{name}.

%prep
%setup -q -n %{name}-%{version}/%{name}

# fuse-udev_rules.patch
%patch0 -p1
# fuse-0001-More-parentheses.patch
%patch1 -p1
# 200-backport_arm64_fuse_kernel_h_clean_includes.patch
%patch2 -p1
%autosetup -p1 -n %{name}-%{version}/%{name}

%build
export UDEV_RULES_PATH=/lib/udev/rules.d
./makeconf.sh

%configure --disable-static \
Expand All @@ -81,6 +72,9 @@ rm -f %{buildroot}/dev/fuse
rm -rf %{buildroot}/dev
%endif

# Delete pointless udev rules, default udev rules contain fuse already.
rm -f %{buildroot}%{_sysconfdir}/udev/rules.d/99-fuse.rules

mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
install -m0644 -t %{buildroot}%{_docdir}/%{name}-%{version} \
AUTHORS ChangeLog NEWS README.md README.NFS
Expand All @@ -96,7 +90,6 @@ install -m0644 -t %{buildroot}%{_docdir}/%{name}-%{version} \
%attr(4755,root,root) /bin/fusermount
/bin/ulockmgr_server
%exclude %{_sysconfdir}/init.d/fuse
%config /lib/udev/rules.d/99-fuse.rules

%files devel
%defattr(-,root,root,-)
Expand Down

0 comments on commit ce1abbf

Please sign in to comment.