diff --git a/authconfig-6.2.10-python23.patch b/authconfig-6.2.10-python23.patch deleted file mode 100644 index 835f6da..0000000 --- a/authconfig-6.2.10-python23.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up authconfig-6.2.10/authconfig-gtk.py.python23 authconfig-6.2.10/authconfig-gtk.py ---- authconfig-6.2.10/authconfig-gtk.py.python23 2015-02-20 14:53:08.000000000 +0100 -+++ authconfig-6.2.10/authconfig-gtk.py 2015-02-20 16:24:39.622211432 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - # -*- coding: UTF-8 -*- - # - # Authconfig - client authentication configuration program -diff -up authconfig-6.2.10/authconfig.py.python23 authconfig-6.2.10/authconfig.py ---- authconfig-6.2.10/authconfig.py.python23 2015-02-20 14:53:08.000000000 +0100 -+++ authconfig-6.2.10/authconfig.py 2015-02-20 16:24:43.425297444 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # -*- coding: UTF-8 -*- - # - # Authconfig - client authentication configuration program diff --git a/authconfig.spec b/authconfig.spec index 79cfeed..1da3ab2 100644 --- a/authconfig.spec +++ b/authconfig.spec @@ -1,21 +1,18 @@ Summary: Command line tool for setting up authentication from network services Name: authconfig Version: 6.2.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ ExclusiveOS: Linux Group: System Environment/Base URL: https://fedorahosted.org/authconfig Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2 Patch1: authconfig-6.2.6-gdm-nolastlog.patch -Patch2: authconfig-6.2.10-python23.patch -Requires: newt-python3, pam >= 0.99.10.0, libpwquality > 0.9 +Requires: newt-python, pam >= 0.99.10.0, python, libpwquality > 0.9 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0 Conflicts: nss_ldap < 254, sssd < 0.99.1 Conflicts: freeipa-client < 2.2.0, ipa-client < 2.2.0 -BuildRequires: glib2-devel -BuildRequires: python2-devel -BuildRequires: python3-devel +BuildRequires: glib2-devel, python >= 2.6, python-devel BuildRequires: desktop-file-utils, intltool, gettext, perl-XML-Parser Requires: /usr/bin/openssl Requires: policycoreutils @@ -41,25 +38,13 @@ authentication schemes. %prep %setup -q -n %{name}-%{version} %patch1 -p1 -b .nolastlog -%patch2 -p1 -b .python23 - -rm -rf %{py3dir} -cp -a . %{py3dir} %build -%configure --with-python-rev=2 -make -pushd %{py3dir} -%configure --with-python-rev=3 +%configure make -popd %install make install DESTDIR=$RPM_BUILD_ROOT -pushd %{py3dir} -make install DESTDIR=$RPM_BUILD_ROOT -popd - rm $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/acutil.a rm $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/acutil.la rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/authconfig-tui.py @@ -96,7 +81,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_mandir}/man8/authconfig-gtk.* %{_mandir}/man8/* %{_mandir}/man5/* -%{_libdir}/python3*/site-packages/acutil.so +%{_libdir}/python*/site-packages/acutil.so %dir %{_datadir}/%{name} %{_datadir}/%{name}/authconfig.py* %{_datadir}/%{name}/authconfig-tui.py* @@ -118,7 +103,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man8/authconfig-gtk.* %{_datadir}/%{name}/authconfig.glade %{_datadir}/%{name}/authconfig-gtk.py* -%{_libdir}/python2*/site-packages/acutil.so %config(noreplace) %{_sysconfdir}/pam.d/authconfig-gtk %config(noreplace) %{_sysconfdir}/pam.d/system-config-authentication %config(noreplace) %{_sysconfdir}/security/console.apps/authconfig-gtk @@ -136,6 +120,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/256x256/apps/system-config-authentication.* %changelog +* Mon Feb 23 2015 Tomáš Mráz - 6.2.10-2 +- revert the python3 change of the command line UI as the + feature is postponed to Fedora 23 + * Fri Feb 20 2015 Tomáš Mráz - 6.2.10-1 - allow multiple LDAP URIs in the setting again - winbind modules are now in samba-winbind package