diff --git a/libnjb.perms b/libnjb.perms deleted file mode 100644 index b03ce04..0000000 --- a/libnjb.perms +++ /dev/null @@ -1,2 +0,0 @@ -=/dev/libnjb* - 0600 0600 root diff --git a/libnjb.spec b/libnjb.spec index 49e288c..4fd3802 100644 --- a/libnjb.spec +++ b/libnjb.spec @@ -3,18 +3,16 @@ Name: libnjb Version: 2.2.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A software library for talking to the Creative Nomad Jukeboxes and Dell DJs URL: http://libnjb.sourceforge.net/ Group: System Environment/Libraries Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: libnjb.rules -Source2: libnjb.perms BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: BSD Requires: udev -Requires: pam BuildRequires: libusb-devel BuildRequires: zlib-devel BuildRequires: ncurses-devel @@ -64,9 +62,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libnjb.la # Install udev rules file. mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libnjb.rules -# Install device permissions -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/ -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libnjb.perms mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop install -p -m 644 libnjb.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi # Copy documentation to a good place @@ -82,7 +77,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 @@ -94,7 +89,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-libnjb.fdi %files examples %defattr(-, root, root) @@ -110,6 +104,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 11 2008 Linus Walleij 2.2.6-4 +- Loose console permissions. See if docs build fine again. * Sat Feb 9 2008 Linus Walleij 2.2.6-3 - Rebuild for GCC 4.3. * Wed Oct 24 2007 Linus Walleij 2.2.6-2