diff options
| author | Simo Sorce <simo@redhat.com> | 2013-08-27 15:14:22 -0400 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-08-28 11:03:55 +0200 |
| commit | 0681ea99f2e2e782e0768fdc95f67f959f384799 (patch) | |
| tree | 958807f3f17abef9d6425cbfacd3c979123caba7 | |
| parent | 79945229fac403bb477f0a5c57d2088ad38bbfee (diff) | |
| download | sssd-0681ea99f2e2e782e0768fdc95f67f959f384799.tar.gz sssd-0681ea99f2e2e782e0768fdc95f67f959f384799.tar.xz sssd-0681ea99f2e2e782e0768fdc95f67f959f384799.zip | |
BUILD: Remove unnecessary patch and configure opts
Now that we use the libkrb5 defaults for the default ccname template
we do not need the patch that changes the man pages defaults nor the
configure options to change sssd defaults anymore.
Related:
https://fedorahosted.org/sssd/ticket/2036
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | contrib/sssd-1.9-man-change-default-ccache.patch | 21 | ||||
| -rw-r--r-- | contrib/sssd.spec.in | 8 |
3 files changed, 0 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am index c1e5a4b1f..a71f309f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1950,7 +1950,6 @@ RPMBUILD ?= $(PWD)/rpmbuild dist_noinst_DATA += \ m4 \ contrib/sssd.spec.in \ - contrib/sssd-1.9-man-change-default-ccache.patch \ BUILD.txt \ COPYING @@ -1964,7 +1963,6 @@ rpmroot: rpmbrprep: dist-gzip rpmroot cp $(builddir)/contrib/sssd.spec $(RPMBUILD)/SPECS cp $(distdir).tar.gz $(RPMBUILD)/SOURCES - cp $(srcdir)/contrib/*.patch $(RPMBUILD)/SOURCES rpms: rpmbrprep cd $(RPMBUILD); \ diff --git a/contrib/sssd-1.9-man-change-default-ccache.patch b/contrib/sssd-1.9-man-change-default-ccache.patch deleted file mode 100644 index 9e7f8cb3f..000000000 --- a/contrib/sssd-1.9-man-change-default-ccache.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up sssd-1.8.97/src/man/sssd-krb5.5.xml.ccachepath sssd-1.8.97/src/man/sssd-krb5.5.xml ---- sssd-1.8.97/src/man/sssd-krb5.5.xml.ccachepath 2012-08-24 12:14:27.459225839 +0200 -+++ sssd-1.8.97/src/man/sssd-krb5.5.xml 2012-08-24 12:14:43.845079652 +0200 -@@ -148,7 +148,7 @@ - </citerefentry> for details) is created. - </para> - <para> -- Default: /tmp -+ Default: /run/user/%U - </para> - </listitem> - </varlistentry> -@@ -208,7 +208,7 @@ - used to create a unique filename in a safe way. - </para> - <para> -- Default: FILE:%d/krb5cc_%U_XXXXXX -+ Default: DIR:%d/krb5cc - </para> - </listitem> - </varlistentry> diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index d85c51a70..217625a3a 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -18,10 +18,6 @@ %define __provides_exclude_from %{python_sitearch}/.*\.so$ %endif -%if (0%{?fedora} >= 17) - %global with_ccache --with-default-ccache-dir='/run/user/%U' --with-default-ccname-template="DIR:%d/krb5cc" -%endif - %if (0%{?fedora} >= 16) %global use_systemd 1 %endif @@ -56,7 +52,6 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ### Patches ### -Patch0001: sssd-1.9-man-change-default-ccache.patch ### Dependencies ### @@ -365,9 +360,6 @@ be used by Python applications. %prep %setup -q -n %{name}-%{version} -%if (0%{?fedora} >= 17) -%patch0001 -p1 -%endif %build |