From ba0fba8d1aa04180a73828c6ec6064d7f731dc61 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: May 05 2006 11:53:46 +0000 Subject: - Ship PAM and userhelper files. - Requires usermode. --- diff --git a/system-config-printer.console b/system-config-printer.console new file mode 100644 index 0000000..840b83e --- /dev/null +++ b/system-config-printer.console @@ -0,0 +1,4 @@ +USER=root +PROGRAM=/usr/sbin/system-config-printer +SESSION=true +FALLBACK=true diff --git a/system-config-printer.pam b/system-config-printer.pam new file mode 100644 index 0000000..c7d67e3 --- /dev/null +++ b/system-config-printer.pam @@ -0,0 +1,4 @@ +#%PAM-1.0 +auth include config-util +account include config-util +session include config-util diff --git a/system-config-printer.spec b/system-config-printer.spec index daa3953..c6131c2 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -8,7 +8,9 @@ License: GPL Group: System Environment/Base Source0: system-config-printer-%{version}.tar.bz2 Source1: pycups-%{pycups_version}.tar.bz2 -Source2: options.py +Source2: system-config-printer.pam +Source3: system-config-printer.console +Source4: options.py Patch0: pycups-no-classes.patch %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')} @@ -22,6 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: pygtk2 >= 2.4.0, pygtk2-libglade Requires: PyXML +Requires: usermode >= 1.37 Obsoletes: system-config-printer-gui <= 0.6.152 @@ -48,10 +51,15 @@ popd mkdir -p %buildroot%{_datadir}/%{name} mkdir -p %buildroot%{_bindir} -install -m0644 *.py %{SOURCE2} %buildroot%{_datadir}/%{name}/ +mkdir -p %buildroot%{_sbindir} +mkdir -p %buildroot%{_sysconfdir}/pam.d +mkdir -p %buildroot%{_sysconfdir}/security/console.apps +install -m0755 *.py %{SOURCE4} %buildroot%{_datadir}/%{name}/ install -m0644 *.glade %buildroot%{_datadir}/%{name}/ -chmod 755 %buildroot%{_datadir}/%{name}/%{name}.py -install -m0755 %{name} %buildroot%{_bindir}/ +install -m0755 %{name} %buildroot%{_sbindir}/ +install -m0644 %{SOURCE2} %buildroot%{_sysconfdir}/pam.d/%{name} +install -m0644 %{SOURCE3} %buildroot%{_sysconfdir}/security/console.apps/%{name} +ln -s consolehelper %buildroot%{_bindir}/%{name} # Desktop file installation. mkdir $RPM_BUILD_ROOT%{_datadir}/applications @@ -71,11 +79,16 @@ rm -rf $RPM_BUILD_ROOT %doc ChangeLog README NEWS TODO %{_libdir}/python*/*/*.so %{_bindir}/%{name} +%{_sbindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/redhat-system-config-printer.desktop +%{_sysconfdir}/pam.d/%{name} +%{_sysconfdir}/security/console.apps/%{name} %changelog * Fri May 5 2006 Tim Waugh +- Ship PAM and userhelper files. +- Requires usermode. - Added missing options.py file. - Fix getClasses() in pycups.