- up to 6.1.15 from fedora

Changed files:
    authconfig-make.patch -> 1.2
    authconfig-po.patch -> 1.2
    authconfig.spec -> 1.45

diff --git a/authconfig-make.patch b/authconfig-make.patch
deleted file mode 100644 (file)
index b97ec1f..0000000
--- a/authconfig-make.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur authconfig-1.7.orig/Makefile authconfig-1.7/Makefile
---- authconfig-1.7.orig/Makefile       Wed Mar 10 00:41:25 1999
-+++ authconfig-1.7/Makefile    Sat Jul 17 15:37:13 1999
-@@ -18,7 +18,7 @@
- authconfig: $(PROGNAME).c
- 
- install:
--      mkdir -p $(INSTROOT)/usr/sbin $(INSTROOT)/usr/man/man8
-+      mkdir -p $(INSTROOT)/usr/sbin $(INSTROOT)/usr/share/man/man8
-       install -m 755 -s $(PROGNAME) $(INSTROOT)/usr/sbin/$(PROGNAME)
-       for d in $(SUBDIRS); do \
-       (cd $$d; $(MAKE) INSTROOT=$(INSTROOT) install) \
-Only in authconfig-1.7: authconfig
-diff -ur authconfig-1.7.orig/man/Makefile authconfig-1.7/man/Makefile
---- authconfig-1.7.orig/man/Makefile   Thu Feb  4 22:10:18 1999
-+++ authconfig-1.7/man/Makefile        Sat Jul 17 15:37:58 1999
-@@ -1,11 +1,11 @@
- all:
- 
- install:
--      install -m 644 en/authconfig.8 $(INSTROOT)/usr/man/man8
-+      install -m 644 en/authconfig.8 $(INSTROOT)/usr/share/man/man8
-       for d in $(shell ls | grep -v en | grep -v Makefile | grep -v CVS)""; do \
-               [ -z "$$d" ] && continue; \
--              mkdir -p  $(INSTROOT)/usr/man/$$d/man8 ; \
--              install -m 644 $$d/authconfig.8 $(INSTROOT)/usr/man/$$d/man8 ; \
-+              mkdir -p  $(INSTROOT)/usr/share/man/$$d/man8 ; \
-+              install -m 644 $$d/authconfig.8 $(INSTROOT)/usr/share/man/$$d/man8 ; \
-       done
- 
- clean:
-Only in authconfig-1.7/po: hu.mo
-Only in authconfig-1.7/po: in.mo
-Only in authconfig-1.7/po: no.mo
-Only in authconfig-1.7/po: sk.mo

diff --git a/authconfig-po.patch b/authconfig-po.patch
deleted file mode 100644 (file)
index 397d324..0000000
--- a/authconfig-po.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -u authconfig-2.0/po.orig/id.po authconfig-2.0/po/id.po
---- authconfig-2.0/po.orig/id.po       Mon Sep 20 11:26:00 1999
-+++ authconfig-2.0/po/id.po    Tue Aug  3 22:51:18 2004
-@@ -2,7 +2,6 @@
- # Copyright (C) 1999 Free Software Foundation, Inc.
- # Mohammad DAMT <mdamt@linux.or.id>, 1999.
- #
--# , fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: ID-authconfig 1.0\n"
-@@ -11,8 +10,8 @@
- "Last-Translator: Mohammad DAMT <mdamt@ldp.linux.or.id>\n"
- "Language-Team: LDP Indonesia <http://ldp.linux.or.id>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain\n"
--"Content-Transfer-Encoding: ISO-8859-1\n"
-+"Content-Type: text/plain; charset=ISO-8859-1\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
- #: ../authconfig.c:36 ../authconfig.c:386
- #, c-format
-diff -u authconfig-2.0/po.orig/it.po authconfig-2.0/po/it.po
---- authconfig-2.0/po.orig/it.po       Mon Sep 20 11:26:01 1999
-+++ authconfig-2.0/po/it.po    Tue Aug  3 22:50:17 2004
-@@ -11,7 +11,7 @@
- "Language-Team: ITALIAN <it@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8959-1\n"
--"Content-Transfer-Encoding: ascii\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
- #: ../authconfig.c:36 ../authconfig.c:386
- #, c-format
-diff -u authconfig-2.0/po.orig/sk.po authconfig-2.0/po/sk.po
---- authconfig-2.0/po.orig/sk.po       Mon Sep 20 11:26:01 1999
-+++ authconfig-2.0/po/sk.po    Tue Aug  3 22:50:32 2004
-@@ -11,7 +11,7 @@
- "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-2\n"
--"Content-Transfer-Encoding: plain\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
- #: ../authconfig.c:36 ../authconfig.c:386
- #, c-format

diff --git a/authconfig.spec b/authconfig.spec
index e63cedda83c94084d5468147aaa8b93d6a8f1b98..0258f5639e649515e2179560fb59e634effd4a8f 100644 (file)
--- a/authconfig.spec
+++ b/authconfig.spec
@@ -7,19 +7,23 @@ Summary(pt_BR.UTF-8): Ferramenta de interface texto para configuração de senha
 Summary(ru.UTF-8):     Утилита текстового режима для настройки shadow и NIS-паролей
 Summary(uk.UTF-8):     Утиліта текстового режиму для налагодження shadow та NIS-паролів
 Name:          authconfig
-Version:       2.0
-Release:       8
+Version:       6.1.15
+Release:       0.1
 License:       GPL
 Group:         Base
-Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 5299be78429fd5f550950966b0a3e015
-Patch0:                %{name}-make.patch
-Patch1:                %{name}-po.patch
+Source0:       https://fedorahosted.org/releases/a/u/authconfig/%{name}-%{version}.tar.bz2
+# Source0-md5: 97adf98a5748ea1898f6ae603ec02792
+URL:           https://fedorahosted.org/authconfig
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
 BuildRequires: gettext-devel
+BuildRequires: glib2-devel
+BuildRequires: intltool
 BuildRequires: newt-devel
+BuildRequires: perl-XML-Parser
 BuildRequires: popt-devel
+BuildRequires: python-devel
 BuildRequires: slang-devel >= 2.0.0
-ExclusiveOS:   Linux
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -68,35 +72,100 @@ Information Service (NIS) та shadow (більш безпечних) парол
 системі. Authconfig також конфігурує систему для автоматичного запуску
 NIS при старті системи.
 
+%package gtk
+Summary:       Graphical tool for setting up authentication from network services
+Group:         Base
+Requires:      %{name} = %{version}-%{release}
+Requires:      gtk-update-icon-cache
+Requires:      hicolor-icon-theme
+Requires:      python-pygtk-glade >= 2.14.0
+Requires:      usermode-gtk
+
+%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.
+
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
-mv po/{no,nb}.po
-mv po/sr{,@Latn}.po
+#mv po/sr{,@latin}.po
 
 %build
-%{__make} \
-       CFLAGS="-DVERSION=\"${VERSION}\" %{rpmcflags} -Wall"
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
-       INSTROOT=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/acutilmodule.a
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/acutilmodule.la
 
-# remove empty translation files
-for f in $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/*.mo; do
-       [ "`file $f | sed -e 's/.*,//' -e 's/message.*//'`" -le 1 ] && rm -f $f
-done
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/authconfig-tui.py
+ln -s authconfig.py $RPM_BUILD_ROOT%{_datadir}/%{name}/authconfig-tui.py
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post gtk
+%update_icon_cache_post hicolor
+
+%postun gtk
+%update_icon_cache_post hicolor
+
+%triggerin -- authconfig <= 5.4.9
+authconfig --update --nostart >/dev/null 2>&1 || :
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
+%doc NOTES TODO README.samba3
+%ghost %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/authconfig
+%ghost %config(noreplace) /etc/pam.d/system-auth-ac
+%ghost %config(noreplace) /etc/pam.d/password-auth-ac
+%ghost %config(noreplace) /etc/pam.d/fingerprint-auth-ac
+%ghost %config(noreplace) /etc/pam.d/smartcard-auth-ac
+%ghost %config(noreplace) /etc/pam.d/postlogin-ac
+%attr(755,root,root) %{_sbindir}/cacertdir_rehash
 %attr(755,root,root) %{_sbindir}/authconfig
+%attr(755,root,root) %{_sbindir}/authconfig-tui
+%attr(755,root,root) %{py_sitedir}/acutilmodule.so
+%exclude %{_mandir}/man8/system-config-authentication.*
+%exclude %{_mandir}/man8/authconfig-gtk.*
 %{_mandir}/man8/*
+%{_mandir}/man5/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/authconfig.py*
+%{_datadir}/%{name}/authconfig-tui.py*
+%{_datadir}/%{name}/authinfo.py*
+%{_datadir}/%{name}/shvfile.py*
+%{_datadir}/%{name}/dnsclient.py*
+%{_datadir}/%{name}/msgarea.py*
+%attr(700,root,root) %dir %{_localstatedir}/lib/%{name}
+
+%files gtk
+%defattr(644,root,root,755)
+%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
+%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
+%attr(755,root,root) %{_bindir}/authconfig
+%attr(755,root,root) %{_bindir}/authconfig-tui
+%attr(755,root,root) %{_bindir}/authconfig-gtk
+%attr(755,root,root) %{_bindir}/system-config-authentication
+%attr(755,root,root) %{_sbindir}/authconfig-gtk
+%attr(755,root,root) %{_sbindir}/system-config-authentication
+%{_mandir}/man8/system-config-authentication.*
+%{_mandir}/man8/authconfig-gtk.*
+%{_datadir}/%{name}/authconfig.glade
+%{_datadir}/%{name}/authconfig-gtk.py*
+%{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/*/apps/system-config-authentication.*