summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2013-08-27 15:14:22 -0400
committerJakub Hrozek <jhrozek@redhat.com>2013-08-28 11:00:03 +0200
commitac54a88b4b510289a411f334e371282d00e1538d (patch)
treecf3e1c0223ae18df256fcb85cdcf43df0e1948c6
parentdcc6877aa2e2dd63a9dc9c411a9c58feaeb36b9a (diff)
downloadsssd-ac54a88b4b510289a411f334e371282d00e1538d.tar.gz
sssd-ac54a88b4b510289a411f334e371282d00e1538d.tar.bz2
sssd-ac54a88b4b510289a411f334e371282d00e1538d.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.am2
-rw-r--r--contrib/sssd-1.9-man-change-default-ccache.patch21
-rw-r--r--contrib/sssd.spec.in8
3 files changed, 0 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am
index 5cd99b18..c3f3c4a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1971,7 +1971,6 @@ RPMBUILD ?= $(PWD)/rpmbuild
dist_noinst_DATA += \
m4 \
contrib/sssd.spec.in \
- contrib/sssd-1.9-man-change-default-ccache.patch \
BUILD.txt \
COPYING
@@ -1991,7 +1990,6 @@ if GIT_CHECKOUT
endif
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 9e7f8cb3..00000000
--- 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 d85c51a7..217625a3 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