Re: SPECS: authconfig

[Paweł Zuzelski]

Dzięki za uwagi. Poprawiłem to wszystko.

Dodatkowo zamieniłem zależność od usermode na Suggests. Myślę, że wystarczy, 
jak linki do consolehelpera będą tworzone przez triggery.

Poprawiona wersja + potrzebne patche w załączniku.

-- 
Pozdrawiam,
Paweł Zuzelski

--- authconfig.desktop.in	2007-07-18 15:02:34.000000000 +0000
+++ ../authconfig-5.3.20.new/authconfig.desktop.in	2008-03-06 10:38:27.000000000 +0000
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 _Name=Authentication
 _Comment=Control how the system verifies users who attempt to log in
-Icon=user_auth.png
+Icon=user_auth
 Exec=/usr/bin/system-config-authentication
 Type=Application
 Terminal=false

--- authinfo.py	2008-01-09 21:33:12.000000000 +0000
+++ ../authconfig-5.3.20.new/authinfo.py	2008-03-10 19:33:30.000000000 +0000
@@ -2963,10 +2963,8 @@
 		# now, do file manipulation on the password files themselves.
 		if self.enableShadow:
 			os.system("/usr/sbin/pwconv")
-			os.system("/usr/sbin/grpconv")
 		else:
 			os.system("/usr/sbin/pwunconv")
-			os.system("/usr/sbin/grpunconv")
 		return True
 
 	def joinDomain(self, echo):

--- authconfig.spec	2008-03-11 18:06:17.000000000 +0000
+++ authconfig.spec.new	2008-03-11 18:02:22.000000000 +0000
@@ -1,33 +1,39 @@
 # $Revision: 1.43 $, $Date: 2007-02-12 21:23:48 $
-Summary:	Text-mode tool for setting up NIS and shadow passwords
-Summary(de.UTF-8):	Textmodus-Tool, um NIS und shadow-Passwoerter zu konfigurieren
-Summary(es.UTF-8):	Herramienta de interfaz texto para configuraciĂłn de contraseĂąas shadow y NIS
-Summary(ja.UTF-8):	NIS とシャドーパスワードを設定するためのテキストモードのツール。
-Summary(pl.UTF-8):	Narzędzie do ustawiania przesłoniętych haseł oraz NIS
-Summary(pt_BR.UTF-8):	Ferramenta de interface texto para configuração de senhas shadow e NIS
-Summary(ru.UTF-8):	Утилита текстового режима для настройки shadow и NIS-паролей
-Summary(uk.UTF-8):	Утиліта текстового режиму для налагодження shadow та NIS-паролів
+Summary:	Text-mode tool for setting up network authentication schemes and shadow passwords
+Summary(pl.UTF-8):	Tekstowe narzędzie do ustawiania przesłoniętych haseł oraz sieciowych systemów uwierzytelniania
 Name:		authconfig
-Version:	2.0
-Release:	8
+Version:	5.3.20
+Release:	1
 License:	GPL
 Group:		Base
-Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	5299be78429fd5f550950966b0a3e015
-Patch0:		%{name}-make.patch
-Patch1:		%{name}-po.patch
+Source0:	http://resources.ync.pl/download/Sources/%{name}-%{version}.tar.bz2
+# Source0-md5:	f0187a868b30b5dd66b78c2e07d247d4
+Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-grpconv.patch
+BuildRequires:	desktop-file-utils
 BuildRequires:	gettext-devel
-BuildRequires:	newt-devel
-BuildRequires:	popt-devel
-BuildRequires:	slang-devel >= 2.0.0
+BuildRequires:	glib2-devel
+BuildRequires:	intltool
+BuildRequires:	perl-XML-Parser
+BuildRequires:	python >= 2.4.1
+BuildRequires:	python-devel
+Requires:	pam >= 0.99.8.1-14
+Requires:	python
+Requires:	python-modules
+Requires:	python-snack
+Suggests:	usermode
+Conflicts:	nss_ldap < 254
+Conflicts:	pam_krb5 < 1.49
+Conflicts:	samba-client < 3.0
+Conflicts:	samba-common < 3.0
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Authconfig is a terminal mode program for setting up Network
-Information Service (NIS) and shadow (more secure) passwords on your
-system. Authconfig also configures the system to automatically turn on
-NIS at system startup.
+Authconfig is a command line utility which can configure a workstation
+to use shadow (more secure) passwords. Authconfig can also configure a
+system to be a client for certain networked user information and
+authentication schemes.
 
 %description -l de.UTF-8
 Authconfig ist ein Textmodus-Programm, um Network
@@ -42,15 +48,14 @@
 
 %description -l ja.UTF-8
 authconfig はシステムに Network Information Service (NIS) とシャドー
-(よりセキュリティーが高い)パスワードのセッティングをする端末モードの
-プログラムです。authconfig はまたシステム起動時に自動的に NIS を
-オンにするようにシステムを設定できます。
+(よりセキュリティーが高い)パスワードのセッティングをする端末モードの プログラムです。authconfig はまたシステム起動時に自動的に
+NIS を オンにするようにシステムを設定できます。
 
 %description -l pl.UTF-8
-Authconfig jest terminalowym programem dla ustawiania NIS (Network
-Information Service) oraz przesłoniętych (bardziej bezpiecznych) haseł
-w Twoim systemie. Authconfig dodatkowo konfiguruje system tak by NIS
-był aktywowany przy starcie systemu.
+Authconfig jest terminalowym programem pomagającym skonfigurować hasła
+shadow w systemie. Authconfig potrafi również skonfigurować system,
+aby był klientem różnych sieciowych systemów uwierzytelniania takich
+jak NIS albo LDAP.
 
 %description -l pt_BR.UTF-8
 O authconfig ĂŠ um programa de interface texto para configurar o NIS e
@@ -69,23 +74,44 @@
 системі. Authconfig також конфігурує систему для автоматичного запуску
 NIS при старті системи.
 
+
+%package gtk
+Summary:	Graphical tool for setting up network authentication schemes and shadow passwords
+Summary(pl.UTF-8):	Graficzne narzędzie do ustawiania przesłoniętych haseł oraz sieciowych systemów uwierzytelniania
+Group:		Base
+Requires:	%{name} = %{version}-%{release}
+Requires:	python-pygtk-glade >= 2.4.0
+
+%description gtk
+Authconfig-gtk is a GUI program which can configure a workstation to
+use shadow (more secure) passwords. Authconfig-gtk can also configure
+a system to be a client for certain networked user information and
+authentication schemes.
+
+%description -l pl.UTF-8
+Authconfig-gtk jest graficznym programem pomagającym skonfigurować
+hasła shadow w systemie. Authconfig potrafi również skonfigurować
+system, aby był klientem różnych sieciowych systemów uwierzytelniania
+takich jak NIS albo LDAP.
+
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
-mv po/{no,nb}.po
-mv po/sr{,@Latn}.po
+%patch0 -p0
+%patch1 -p0
 
 %build
-%{__make} \
-	CFLAGS="-DVERSION=\"${VERSION}\" %{rpmcflags} -Wall"
+CFLAGS="-fPIC -DVERSION=%{version} %{rpmcflags} -Wall"
+export CFLAGS
+%configure
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	INSTROOT=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT
 
 # remove empty translation files
 for f in $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/*.mo; do
@@ -94,13 +120,65 @@
 
 %find_lang %{name}
 
+rm $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/acutilmodule.a
+rm $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/acutilmodule.la
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/authconfig-tui.py
+rm -rf $RPM_BUILD_ROOT%{_bindir}
+ln -s authconfig.py $RPM_BUILD_ROOT%{_datadir}/%{name}/authconfig-tui.py
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerin -- usermode
+ln -s %{_bindir}/consolehelper %{_bindir}/authconfig
+ln -s %{_bindir}/consolehelper %{_bindir}/authconfig-tui
+
+%triggerun -- usermode
+rm %{_bindir}/authconfig
+rm %{_bindir}/authconfig-tui
+
+%triggerin gtk -- usermode
+ln -s %{_bindir}/consolehelper %{_bindir}/authconfig-gtk
+ln -s %{_bindir}/consolehelper %{_bindir}/system-config-authentication
+
+%triggerun gtk -- usermode
+rm %{_bindir}/authconfig-gtk
+rm %{_bindir}/system-config-authentication
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
+%doc NOTES TODO README.samba3
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/authconfig
+%config(noreplace) /etc/pam.d/system-auth-ac
+%attr(755,root,root) %{_sbindir}/cacertdir_rehash
 %attr(755,root,root) %{_sbindir}/authconfig
+%attr(755,root,root) %{_sbindir}/authconfig-tui
 %{_mandir}/man8/*
+%{_mandir}/man5/*
+%{py_sitedir}/acutilmodule.so
+%dir %{_datadir}/%{name}
+%attr(755,root,root) %{_datadir}/%{name}/authconfig.py
+%{_datadir}/%{name}/authconfig-tui.py*
+%{_datadir}/%{name}/authinfo.py*
+%{_datadir}/%{name}/shvfile.py*
+%{_datadir}/%{name}/dnsclient.py*
+%config(noreplace) /etc/pam.d/authconfig
+%config(noreplace) /etc/pam.d/authconfig-tui
+%config(noreplace) /etc/security/console.apps/authconfig
+%config(noreplace) /etc/security/console.apps/authconfig-tui
+
+%files gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/authconfig-gtk
+%attr(755,root,root) %{_sbindir}/system-config-authentication
+%{_datadir}/%{name}/authconfig.glade
+%{_datadir}/%{name}/authconfig-gtk.py*
+%config(noreplace) /etc/pam.d/authconfig-gtk
+%config(noreplace) /etc/pam.d/system-config-authentication
+%config(noreplace) /etc/security/console.apps/authconfig-gtk
+%config(noreplace) /etc/security/console.apps/system-config-authentication
+%{_desktopdir}/*
+%{_pixmapsdir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -204,20 +282,3 @@
 Revision 1.13  1999/07/12 23:05:53  kloczek
 - added using CVS keywords in %changelog (for automating them).
 
-* Mon May 31 1999 Tomasz Kłoczko <[EMAIL PROTECTED]>
-  [1.7-4]
-- added using %%find_lang macro.
-
-* Fri May 14 1999 Tomasz Kłoczko <[EMAIL PROTECTED]>
-  [1.7-3]
-- now package is FHS 2.0 compliant.
-
-* Wed Apr 28 1999 Tomasz Kłoczko <[EMAIL PROTECTED]>
-  [1.7-2]
-- uncommented .mo files and added %lang macros for this files,
-- gzippen man page,
-- Group changed to Base,
-- added BuildPrereq rules,
-- added "rm -rf $RPM_BUILD_ROOT" on top %install.
-
-Spec based on RH version.

_______________________________________________
pld-devel-pl mailing list
pld-devel-pl@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl