diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2010-02-18 17:08:40 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-02-18 17:26:00 -0500 |
| commit | 2265526bcad62bd0af2cbadfa0c0920fb046932d (patch) | |
| tree | 8e1189c8b7d9d78c8deb8a200248f3d54ca5c591 | |
| parent | ba8937d83675c7d69808d1d3df8f823afdc5ce2a (diff) | |
| download | sssd-2265526bcad62bd0af2cbadfa0c0920fb046932d.tar.gz sssd-2265526bcad62bd0af2cbadfa0c0920fb046932d.tar.xz sssd-2265526bcad62bd0af2cbadfa0c0920fb046932d.zip | |
Fix bad merge
Merging ba8937d83675c7d69808d1d3df8f823afdc5ce2a left the COPYING
and COPYING.LESSER files in the now-defunct sss_client directory.
This patch moves them into the right location and fixes the spec
file to look for them correctly.
| -rw-r--r-- | contrib/sssd.spec.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/sss_client/COPYING (renamed from sss_client/COPYING) | 0 | ||||
| -rw-r--r-- | src/sss_client/COPYING.LESSER (renamed from sss_client/COPYING.LESSER) | 0 |
4 files changed, 3 insertions, 1 deletions
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 96dc466a6..2c3398d86 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -302,7 +302,7 @@ rm -rf $RPM_BUILD_ROOT %files client %defattr(-,root,root,-) -%doc sss_client/COPYING sss_client/COPYING.LESSER +%doc src/sss_client/COPYING src/sss_client/COPYING.LESSER /%{_lib}/libnss_sss.so.2 /%{_lib}/security/pam_sss.so %{_mandir}/man8/pam_sss.8* diff --git a/src/Makefile.am b/src/Makefile.am index d5d33de2a..bc53e4ebf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -390,6 +390,8 @@ dist_noinst_DATA += \ examples/sssdproxytest \ examples/sudo \ providers/sssd_be.exports \ + sss_client/COPYING \ + sss_client/COPYING.LESSER \ m4 ###################### diff --git a/sss_client/COPYING b/src/sss_client/COPYING index 94a9ed024..94a9ed024 100644 --- a/sss_client/COPYING +++ b/src/sss_client/COPYING diff --git a/sss_client/COPYING.LESSER b/src/sss_client/COPYING.LESSER index 755013bb2..755013bb2 100644 --- a/sss_client/COPYING.LESSER +++ b/src/sss_client/COPYING.LESSER |