Accepting request 286307 from home:guohouzuo
A minor rpmspec cleanup to get rid of five rpmlint warnings OBS-URL: https://build.opensuse.org/request/show/286307 OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=145
This commit is contained in:
Git OBS Bridge
parent
b1d6287bca
commit
df5d2d0f39
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 16 10:09:18 UTC 2015 - howard@localhost
|
||||
|
||||
- A minor rpmspec cleanup to get rid of five rpmlint warnings
|
||||
* Remove mentioning of system-wide dbus configuration file from comments.
|
||||
* Remove traditional init script.
|
||||
* Remove compatibility for producing packages on older OpenSUSE releases.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 8 22:23:42 UTC 2015 - jengelh@inai.de
|
||||
|
||||
|
||||
41
sssd.spec
41
sssd.spec
@ -45,13 +45,7 @@ BuildRequires: bind-utils
|
||||
BuildRequires: cifs-utils-devel
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
%if 0%{?suse_version} >= 1320
|
||||
BuildRequires: krb5-devel >= 1.12
|
||||
%define have_localauth 1
|
||||
%else
|
||||
BuildRequires: krb5-devel
|
||||
%define have_localauth 0
|
||||
%endif
|
||||
BuildRequires: libsmbclient-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libxml2-tools
|
||||
@ -291,8 +285,6 @@ License: LGPL-3.0+
|
||||
Group: System/Libraries
|
||||
Provides: libsss_sudo-devel = %version-%release
|
||||
Obsoletes: libsss_sudo-devel < %version-%release
|
||||
# No provides: true obsolete.
|
||||
Obsoletes: libsss_sudo1
|
||||
Supplements: packageand(sudo:sssd-client)
|
||||
|
||||
%description -n libsss_sudo
|
||||
@ -374,17 +366,10 @@ install -d "$b/%_mandir"/{cs,cs/man8,nl,nl/man8,pt,pt/man8,uk,uk/man1} \
|
||||
"$b/%_mandir"/{uk/man5,uk/man8};
|
||||
install -d "$b/%_sysconfdir/sssd";
|
||||
install -m600 src/examples/sssd-example.conf "$b/%_sysconfdir/sssd/sssd.conf";
|
||||
%if 0%{?_unitdir:1}
|
||||
install -d "$b/%_unitdir";
|
||||
# Missing service file in 1.11.5.1
|
||||
#install src/sysv/systemd/sssd.service "$b/%_unitdir/sssd.service";
|
||||
install -m644 %{S:4} "$b/%_unitdir/sssd.service";
|
||||
rm -Rf "$b/%_initddir"
|
||||
ln -s service "$b/%_sbindir/rcsssd"
|
||||
%else
|
||||
install src/sysv/SUSE/sssd "$b/%_sysconfdir/init.d/sssd";
|
||||
ln -sf ../../etc/init.d/sssd "$b/usr/sbin/rcsssd"
|
||||
%endif
|
||||
|
||||
mkdir -p "$b/%_sysconfdir/ld.so.conf.d"
|
||||
cat >"$b/%_sysconfdir/ld.so.conf.d/sssd-wbclient.conf" <<-EOF
|
||||
@ -392,48 +377,32 @@ cat >"$b/%_sysconfdir/ld.so.conf.d/sssd-wbclient.conf" <<-EOF
|
||||
EOF
|
||||
find "$b" -type f -name "*.la" -delete;
|
||||
|
||||
%if %suse_version <= 1110
|
||||
# remove some unsupported languages, sssd does not contain
|
||||
# translations for these anyway
|
||||
rm -Rf "$b/usr/share/locale"/{fa_IR,ja_JP,lt_LT,ta_IN,vi_VN}
|
||||
%endif
|
||||
|
||||
rm -Rf "$b/%_sysconfdir/dbus-1" "$b/%_datadir/dbus-1"
|
||||
|
||||
%find_lang %name --all-name
|
||||
|
||||
%if 0%{?_unitdir:1}
|
||||
%pre
|
||||
%service_add_pre sssd.service
|
||||
%endif
|
||||
|
||||
%post
|
||||
# migrate config variable krb5_kdcip to krb5_server (bnc#851048)
|
||||
/bin/sed -i -e 's,^krb5_kdcip =,krb5_server =,g' %_sysconfdir/sssd/sssd.conf
|
||||
/sbin/ldconfig
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_add_post sssd.service
|
||||
%endif
|
||||
|
||||
%if 0%{?_unitdir:1}
|
||||
%preun
|
||||
%service_del_preun sssd.service
|
||||
%endif
|
||||
|
||||
%postun
|
||||
if [ "$1" = "0" ]; then
|
||||
"%_sbindir/pam-config" -d --sss || :;
|
||||
fi;
|
||||
/sbin/ldconfig
|
||||
%if 0%{?_unitdir:1}
|
||||
# Clear caches, which may have an incompatible format afterwards
|
||||
# (especially, downgrades)
|
||||
rm -f /var/lib/sss/db/*.ldb
|
||||
# del_postun includes a try-restart
|
||||
%service_del_postun sssd.service
|
||||
%else
|
||||
%restart_on_update sssd
|
||||
%endif
|
||||
%insserv_cleanup
|
||||
|
||||
%post -n libipa_hbac0 -p /sbin/ldconfig
|
||||
@ -448,11 +417,7 @@ rm -f /var/lib/sss/db/*.ldb
|
||||
%files -f sssd.lang
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING
|
||||
%if 0%{?_unitdir:1}
|
||||
%_unitdir
|
||||
%else
|
||||
%_initrddir/%name
|
||||
%endif
|
||||
%_bindir/sss_ssh_*
|
||||
%_sbindir/sssd
|
||||
%_sbindir/rcsssd
|
||||
@ -507,9 +472,7 @@ rm -f /var/lib/sss/db/*.ldb
|
||||
/%_lib/security/pam_sss.so
|
||||
%_libdir/cifs-utils/
|
||||
%_libdir/krb5/
|
||||
%if %have_localauth
|
||||
%_libdir/%name/modules/sssd_krb5_localauth_plugin.so
|
||||
%endif
|
||||
%_mandir/??/man8/pam_sss.8*
|
||||
%_mandir/??/man8/sssd_krb5_locator_plugin.8*
|
||||
%_mandir/man8/pam_sss.8*
|
||||
@ -537,8 +500,6 @@ rm -f /var/lib/sss/db/*.ldb
|
||||
%dir %_mandir/??/
|
||||
%dir %_mandir/??/man5/
|
||||
%_mandir/??/man5/sssd-ifp.5*
|
||||
#%_sysconfdir/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
|
||||
#%_datadir/dbus-1/system-services/org.freedesktop.sssd.infopipe.service
|
||||
|
||||
%files ipa
|
||||
%defattr(-,root,root)
|
||||
@ -610,7 +571,7 @@ rm -f /var/lib/sss/db/*.ldb
|
||||
|
||||
%files wbclient
|
||||
%defattr(-,root,root)
|
||||
%_sysconfdir/ld.so.conf.d/sssd-wbclient.conf
|
||||
%config %_sysconfdir/ld.so.conf.d/sssd-wbclient.conf
|
||||
%dir %_libdir/sssd/
|
||||
%dir %_libdir/sssd/modules/
|
||||
%_libdir/sssd/modules/libwbclient.so.*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user