Get rid of PAM console permissions, restore docs.

This commit is contained in:
Linus Walleij 2008-07-11 19:52:52 +00:00
parent d9d25b3344
commit e80a45f54f
2 changed files with 10 additions and 11 deletions

View File

@ -1,2 +0,0 @@
<libmtp>=/dev/libmtp*
<console> 0600 <libmtp> 0600 root

View File

@ -3,17 +3,15 @@
Name: libmtp
Version: 0.2.6.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: A software library for MTP media players
URL: http://libmtp.sourceforge.net/
Group: System Environment/Libraries
Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: libmtp.perms
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
Requires: udev
Requires: pam
Requires: hal
BuildRequires: libusb-devel
BuildRequires: doxygen
@ -53,7 +51,7 @@ library for MTP media players.
%configure --disable-static --program-prefix=mtp-
make %{?_smp_mflags}
# Remove permissions from symlink in udev script, we use
# PAM to fix the permissions instead.
# HALd rules to fix the permissions instead.
examples/hotplug -a"SYMLINK+=\"libmtp-%k\"" > libmtp.rules
%install
@ -66,9 +64,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
install -p -m 644 libmtp.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libmtp.rules
mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop
install -p -m 644 libmtp.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
# Install device permissions
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libmtp.perms
# Copy documentation to a good place
install -p -m 644 AUTHORS ChangeLog COPYING INSTALL README TODO \
$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@ -83,7 +78,7 @@ touch -r configure.ac \
# I don't want to pre-generate it but will instead wait for upstream
# to find a suitable solution that will always bring the same files,
# or that Doxygen is fixed not to do this.
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
# rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
%clean
rm -rf $RPM_BUILD_ROOT
@ -95,7 +90,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root,root,-)
%{_libdir}/*.so.*
%config(noreplace) %{_sysconfdir}/udev/rules.d/*
%config(noreplace) %{_sysconfdir}/security/console.perms.d/*
%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
%files examples
%defattr(-,root,root,-)
@ -111,6 +105,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Jul 11 2008 Linus Walleij <triad@df.lth.se> 0.2.6.1-3
- Loose PAM console permissions, also assume that we can ship
documentation again since Doxygen has been updated. Fedora
HALd rules for the portable_audio_player capability in
20-acl-management.fdi will change permissions on the device
node for each plugged-in device.
* Fri May 23 2008 Adam Jackson <ajax@redhat.com> 0.2.6.1-2
- libmtp-0.2.6.1-simpler-rules.patch: Simplify udev rules for faster bootup.