summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2012-08-24 14:55:31 +0200
committerJakub Hrozek <jhrozek@redhat.com>2012-08-28 14:44:34 +0200
commitd60a79f0060764929037c18b0f75953a34f7a58e (patch)
tree71fbe2554caec095743394a9026899fe18df6392
parent86b61156743b7ebdc049450a6f88452890fd9a61 (diff)
downloadsssd-d60a79f0060764929037c18b0f75953a34f7a58e.tar.gz
sssd-d60a79f0060764929037c18b0f75953a34f7a58e.tar.xz
sssd-d60a79f0060764929037c18b0f75953a34f7a58e.zip
RPM: Switch the default ccache location
https://fedorahosted.org/sssd/ticket/1500
-rw-r--r--Makefile.am1
-rw-r--r--contrib/sssd-1.9-man-change-default-ccache.patch21
-rw-r--r--contrib/sssd.spec.in8
3 files changed, 29 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index b553db2a1..45a2bfb10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1746,6 +1746,7 @@ 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
new file mode 100644
index 000000000..9e7f8cb3f
--- /dev/null
+++ b/contrib/sssd-1.9-man-change-default-ccache.patch
@@ -0,0 +1,21 @@
+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 838e9f54f..44690f08c 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -19,7 +19,7 @@
%endif
%if (0%{?fedora} >= 17)
- %global with_ccache --with-default-ccache-dir='/run/user/%U' --with-default-ccname-template="DIR:%d/ccdir"
+ %global with_ccache --with-default-ccache-dir='/run/user/%U' --with-default-ccname-template="DIR:%d/krb5cc"
%endif
%global enable_experimental 1
@@ -42,6 +42,9 @@ Source0: %{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
### Patches ###
+%if (0%{?fedora} >= 17)
+Patch0001: sssd-1.9-man-change-default-ccache.patch
+%endif
### Dependencies ###
@@ -221,6 +224,9 @@ A utility library to allow communication between SUDO and SSSD
%prep
%setup -q
+%if (0%{?fedora} >= 17)
+%patch0001 -p1
+%endif
%build