[fuse] Drop dependency on initscripts

Peter Lemenkov peter at fedoraproject.org
Sat May 18 13:54:44 UTC 2013


commit 6792bcdf1aa225bd9cf64ee079f510e10b2a45d4
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat May 18 17:54:31 2013 +0400

    Drop dependency on initscripts
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 fuse.spec |   37 ++++++++++++-------------------------
 1 files changed, 12 insertions(+), 25 deletions(-)
---
diff --git a/fuse.spec b/fuse.spec
index 7bcec0c..6b36b36 100644
--- a/fuse.spec
+++ b/fuse.spec
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.9.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -10,13 +10,11 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Source1:	%{name}.conf
 
 Patch1:		fuse-0001-More-parentheses.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       which
 Conflicts:      filesystem < 3
 BuildRequires:  libselinux-devel
 
 Requires(preun): chkconfig
-Requires(preun): initscripts
 
 %description
 With FUSE it is possible to implement a fully functional filesystem in a
@@ -61,40 +59,27 @@ CFLAGS="%{optflags} -D_GNU_SOURCE" %configure
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+make install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 # change from 4755 to 0755 to allow stripping -- fixed later in files
-chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
+chmod 0755 %{buildroot}/%{_bindir}/fusermount
 
 # Get rid of static libs
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
+rm -f %{buildroot}/%{_libdir}/*.a
 # No need to create init-script
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/fuse
+rm -f %{buildroot}%{_sysconfdir}/init.d/fuse
 
 # Install config-file
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}
 
 # Delete pointless udev rules, which do not belong in /etc (brc#748204)
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/99-fuse.rules
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%preun
-if [ -f /etc/init.d/fuse ] ; then
-    /sbin/service fuse stop >/dev/null 2>&1
-    /sbin/chkconfig --del fuse
-fi
-
+rm -f %{buildroot}%{_sysconfdir}/udev/rules.d/99-fuse.rules
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS
 %{_sbindir}/mount.fuse
 %attr(4755,root,root) %{_bindir}/fusermount
@@ -104,13 +89,11 @@ fi
 %{_mandir}/man8/*
 
 %files libs
-%defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_libdir}/libfuse.so.*
 %{_libdir}/libulockmgr.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/libfuse.so
 %{_libdir}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
@@ -119,6 +102,10 @@ fi
 %{_includedir}/fuse
 
 %changelog
+* Sat May 18 2013 Peter Lemenkov <lemenkov at gmail.com> - 2.9.2-3
+- Removed pre-F12 stuff
+- Dropped ancient dependency on initscripts and chkconfig
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list