Author: glen Date: Fri Oct 21 07:21:05 2011 GMT Module: packages Tag: HEAD ---- Log message: - partially apply changes from r1.3 commit
---- Files affected: packages/sssd: sssd.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: packages/sssd/sssd.spec diff -u packages/sssd/sssd.spec:1.4 packages/sssd/sssd.spec:1.5 --- packages/sssd/sssd.spec:1.4 Tue Oct 18 04:58:30 2011 +++ packages/sssd/sssd.spec Fri Oct 21 09:20:59 2011 @@ -1,12 +1,4 @@ # $Revision$, $Date$ -# TODO -#error: Failed build dependencies: -# keyutils-libs-devel is needed by sssd-1.6.1-0.1.src -# krb5-devel >= 1.9 is needed by sssd-1.6.1-0.1.src -# libcollection-devel is needed by sssd-1.6.1-0.1.src -# libdhash-devel >= 0.4.2 is needed by sssd-1.6.1-0.1.src -# libini_config-devel is needed by sssd-1.6.1-0.1.src - %define ldb_version 1.1.0 Summary: System Security Services Daemon Name: sssd @@ -16,6 +8,10 @@ Group: Applications/System URL: http://fedorahosted.org/sssd/ Source0: https://fedorahosted.org/released/sssd/%{name}-%{version}.tar.gz +# Source0-md5: 2da6d0006b70929d4d491e952e808bf5 +Source1: %{name}.init +Patch0: %{name}-python-config.patch +Patch1: %{name}-heimdal.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bind-utils @@ -23,11 +19,12 @@ BuildRequires: check-devel BuildRequires: dbus-devel BuildRequires: dbus-libs +BuildRequires: docbook-dtd44-xml BuildRequires: docbook-style-xsl BuildRequires: doxygen BuildRequires: gettext-devel -BuildRequires: keyutils-libs-devel -BuildRequires: krb5-devel >= 1.9 +BuildRequires: heimdal-devel +BuildRequires: keyutils-devel BuildRequires: libcollection-devel BuildRequires: libdhash-devel >= 0.4.2 BuildRequires: libini_config-devel @@ -52,8 +49,8 @@ BuildRequires: rpmbuild(macros) >= 1.228 BuildRequires: tdb-devel BuildRequires: tevent-devel -Requires(post,preun): /sbin/chkconfig Requires(post,postun): /sbin/ldconfig +Requires(post,preun): /sbin/chkconfig Requires: %{name}-client = %{version}-%{release} Requires: cyrus-sasl-gssapi Requires: krb5-libs >= 1.9 @@ -131,9 +128,16 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build -autoreconf -ivf +%{__gettextize} +%{__aclocal} +%{__automake} +%{__autoconf} +CFLAGS=-Wno-deprecated-declarations +export CFLAGS %configure \ --with-db-path=%{dbpath} \ --with-pipe-path=%{pipepath} \ @@ -190,6 +194,8 @@ $RPM_BUILD_ROOT/%{py_sitedir}/pysss.la \ $RPM_BUILD_ROOT/%{py_sitedir}/pyhbac.la +install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} + touch sssd_tools.lang for man in `find $RPM_BUILD_ROOT/%{_mandir}/??/man?/ -type f | sed -e "s#$RPM_BUILD_ROOT/%{_mandir}/##"`; do lang=`echo $man | cut -c 1-2` @@ -225,9 +231,13 @@ %files -f sssd.lang %defattr(644,root,root,755) +%attr(755,root,root) /etc/rc.d/init.d/sssd +%defattr(644,root,root,755) %attr(755,root,root) %{_sbindir}/sssd -%{_libexecdir}/%{servicename} -%{_libdir}/%{name}/ +%dir %{_libexecdir}/%{servicename} +%attr(755,root,root) %{_libexecdir}/%{servicename}/*child +%attr(755,root,root) %{_libexecdir}/%{servicename}/sssd_* +%attr(755,root,root) %{_libexecdir}/%{servicename}/*.so %attr(755,root,root) %{ldb_modulesdir}/memberof.so %dir %{sssdstatedir} %attr(700,root,root) %dir %{dbpath} @@ -236,12 +246,12 @@ %attr(700,root,root) %dir %{pipepath}/private %attr(750,root,root) %dir %{_var}/log/%{name} %attr(700,root,root) %dir %{_sysconfdir}/sssd -%config(noreplace) %{_sysconfdir}/sssd/sssd.conf +%config(noreplace) %attr(600,root,root) %{_sysconfdir}/sssd/sssd.conf %config(noreplace) /etc/logrotate.d/sssd %config(noreplace) %{_sysconfdir}/rwtab.d/sssd %config %{_sysconfdir}/sssd/sssd.api.conf %attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d -%config %{_sysconfdir}/sssd/sssd.api.d/ +%config %attr(600,root,root) %{_sysconfdir}/sssd/sssd.api.d/* %{_mandir}/man5/sssd.conf.5* %{_mandir}/man5/sssd-ipa.5* %{_mandir}/man5/sssd-krb5.5* @@ -255,7 +265,7 @@ %defattr(644,root,root,755) %attr(755,root,root) /%{_lib}/libnss_sss.so.2 %attr(755,root,root) /%{_lib}/security/pam_sss.so -%attr(755,root,root) %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so +#%attr(755,root,root) %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so %{_mandir}/man8/pam_sss.8* %{_mandir}/man8/sssd_krb5_locator_plugin.8* @@ -282,7 +292,7 @@ %files -n libipa_hbac %defattr(644,root,root,755) -%{_libdir}/libipa_hbac.so.* +%attr(755,root,root) %{_libdir}/libipa_hbac.so.* %files -n libipa_hbac-devel %defattr(644,root,root,755) @@ -301,6 +311,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2011/10/21 07:20:59 glen +- partially apply changes from r1.3 commit + Revision 1.4 2011/10/18 02:58:30 aredridel - Revert last change, needs rework ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sssd/sssd.spec?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
