rpms/eject/devel eject.spec,1.45,1.46 eject.pam,1.1,NONE

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/eject/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16728

Modified Files:
	eject.spec 
Removed Files:
	eject.pam 
Log Message:
- do not run eject through consolehelper (#592367)
- remove an invalid URL of the source tarball


Index: eject.spec
===================================================================
RCS file: /cvs/extras/rpms/eject/devel/eject.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- eject.spec	9 Apr 2010 09:25:03 -0000	1.45
+++ eject.spec	25 May 2010 14:14:46 -0000	1.46
@@ -1,11 +1,10 @@
 Summary: A program that ejects removable media using software control
 Name: eject
 Version: 2.1.5
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
-Source1: eject.pam
+Source: %{name}-%{version}.tar.gz
 Patch1: eject-2.1.1-verbose.patch
 Patch2: eject-timeout.patch
 Patch3: eject-2.1.5-opendevice.patch
@@ -15,7 +14,6 @@ Patch6: eject-2.1.5-umount.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://www.pobox.com/~tranter
 ExcludeArch: s390 s390x
-Requires: usermode
 BuildRequires: gettext
 BuildRequires: libtool
 
@@ -47,18 +45,8 @@ rm -rf %{buildroot}
 
 make DESTDIR=%{buildroot} install
 
-# pam stuff
-install -m 755 -d %{buildroot}/%{_sysconfdir}/pam.d
-install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/%{name}
-
-install -m 755 -d %{buildroot}/%{_sysconfdir}/security/console.apps/
-echo "FALLBACK=true" > %{buildroot}/%{_sysconfdir}/security/console.apps/%{name}
-
 install -m 755 -d %{buildroot}/%{_sbindir}
-pushd %{buildroot}/%{_bindir}
-mv eject ../sbin
-ln -s consolehelper eject
-popd
+ln -s ../bin/eject %{buildroot}/%{_sbindir}
 
 %find_lang %{name}
 
@@ -68,13 +56,15 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README TODO COPYING ChangeLog
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/security/console.apps/*
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/*
 %{_bindir}/*
 %{_sbindir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Tue May 25 2010 Kamil Dudka <kdudka at redhat.com> 2.1.5-19
+- do not run eject through consolehelper (#592367)
+- remove an invalid URL of the source tarball
+
 * Fri Apr 09 2010 Kamil Dudka <kdudka at redhat.com> 2.1.5-18
 - mention the option -i in eject(1) man page (#580389)
 


--- eject.pam DELETED ---