diff --git a/.gitignore b/.gitignore index 738a432..f01b075 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /0.1-alpha.tar.gz /0.1.tar.gz /authselect-0.2.tar.gz +/authselect-0.3.tar.gz diff --git a/authselect.spec b/authselect.spec index c78928a..94c7694 100644 --- a/authselect.spec +++ b/authselect.spec @@ -1,15 +1,11 @@ -# We don't package the -devel subpackage by default because the development API -# is not yet stable. Change to 1 to enable packaging the development -# header and libraries -%global package_devel 0 - Name: authselect -Version: 0.2 -Release: 3%{?dist} +Version: 0.3 +Release: 1%{?dist} Summary: Configures authentication and identity sources from supported profiles +URL: https://github.com/pbrezina/authselect License: GPLv3+ -Source0: https://github.com/pbrezina/authselect/archive/authselect-0.2.tar.gz +Source0: https://github.com/pbrezina/authselect/archive/0.3/authselect-0.3.tar.gz BuildRequires: autoconf BuildRequires: automake @@ -19,7 +15,11 @@ BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: gettext-devel BuildRequires: asciidoc - +Requires: authselect-libs = %{version}-%{release} +Suggests: sssd +Suggests: samba-winbind +Suggests: fprintd-pam +Suggests: oddjob-mkhomedir %description Authselect is designed to be a replacement for authconfig but it takes @@ -39,7 +39,26 @@ License: GPLv3+ Common library files for authselect. This package is used by the authselect command line tool and any other potential front-ends. -%if (0%{?package_devel} == 1) +%package compat +Summary: Tool to provide minimum backwards compatibility with authconfig +Group: Applications/System +License: GPLv3+ +Obsoletes: authconfig +Provides: %{_sbindir}/authconfig +BuildRequires: python3-devel +Requires: python3 +Requires: authselect = %{version}-%{release} +Recommends: sssd +Recommends: realmd +Recommends: samba-winbind +Recommends: oddjob-mkhomedir + +%description compat +This package will replace %{_sbindir}/authconfig with a tool that will +translate some of the authconfig calls into authselect calls. It provides +only minimum backward compatibility and users are encouraged to migrate +to authselect completely. + %package devel Summary: Development libraries and headers for authselect Group: Applications/System @@ -49,7 +68,6 @@ Requires: authselect-libs = %{version}-%{release} %description devel System header files and development libraries for authselect. Useful if you develop a front-end for the authselect library. -%endif %prep @@ -62,7 +80,6 @@ autoreconf -if make %{?_smp_mflags} - %install make install DESTDIR=$RPM_BUILD_ROOT @@ -70,16 +87,11 @@ make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name "*.la" -exec rm -f {} \; find $RPM_BUILD_ROOT -name "*.a" -exec rm -f {} \; -%if (0%{?package_devel} == 0) -rm -f $RPM_BUILD_ROOT/%{_includedir}/authselect.h -rm -f $RPM_BUILD_ROOT/%{_libdir}/libauthselect.so -%endif - %files libs %defattr(-,root,root,-) %dir %{_sysconfdir}/authselect +%dir %{_sysconfdir}/authselect/custom %dir %{_datadir}/authselect -%dir %{_datadir}/authselect/custom %dir %{_datadir}/authselect/vendor %dir %{_datadir}/authselect/default %dir %{_datadir}/authselect/default/sssd/ @@ -108,25 +120,36 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libauthselect.so %license COPYING %doc README.md -%if (0%{?package_devel} == 1) +%files compat +%defattr(-,root,root,-) +%{_sbindir}/authconfig +%{python3_sitelib}/authselect/authcompat.py +%{python3_sitelib}/authselect/authcompat_ConfigSnippet.py +%{python3_sitelib}/authselect/authcompat_EnvironmentFile.py +%{python3_sitelib}/authselect/authcompat_Options.py +%{python3_sitelib}/authselect/snippets/authconfig-krb.conf +%{python3_sitelib}/authselect/snippets/authconfig-sssd.conf +%{python3_sitelib}/authselect/__pycache__/* + %files devel %defattr(-,root,root,-) %{_includedir}/authselect.h %{_libdir}/libauthselect.so -%endif %files %defattr(-,root,root,-) %{_bindir}/authselect %{_mandir}/man8/authselect.8* +%{_mandir}/man7/authselect-migration.7* %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %changelog +* Tue Feb 20 2018 Pavel Březina - 0.3-1 +- rebasing to 0.3 * Wed Feb 07 2018 Fedora Release Engineering - 0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - * Wed Jan 10 2018 Pavel Březina - 0.2-2 - fix rpmlint errors * Wed Jan 10 2018 Pavel Březina - 0.2-1 diff --git a/sources b/sources index c30c5c9..cfb6c54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (authselect-0.2.tar.gz) = 52b6a885123f1bf7740f029799c8a36cf9c69cdf9c5c218e92a3d85eb2417cb0568f305081449b3feb2ac2a449d822a76d22a3b7cf9a257a452397dd8164e219 +SHA512 (authselect-0.3.tar.gz) = 5e596fc68376aa6643f472f7cc637a7f8916f8951e502a74bb76e173c80b84a4d3542a5c0d13facde58fc0fa15a592196b464d588e601e5a8cc68c6d58c5d5c6