summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2013-08-13 10:59:57 +0200
committerMartin Kosek <mkosek@redhat.com>2013-08-13 15:31:46 +0200
commitb1474a53c0c249b5090fb067a3cdf99316989afe (patch)
tree303e76b7a63e31c978dc9cb337284e388c2a1def
parentba5311b7baa3704e9e7ac6601e82b7b512e25e39 (diff)
downloadfreeipa-b1474a53c0c249b5090fb067a3cdf99316989afe.tar.gz
freeipa-b1474a53c0c249b5090fb067a3cdf99316989afe.tar.xz
freeipa-b1474a53c0c249b5090fb067a3cdf99316989afe.zip
Fix selected minor issues in the spec file and license
This patch fixes: - too long description for server-trust-ad subpackage - adds (noreplace) flag %{_sysconfdir}/tmpfiles.d/ipa.conf to avoid overwriting potential user changes - changes permissions on default_encoding_utf8.so to prevent it pollute python subpackage Provides. - wrong address in GPL v2 license preamble in 2 distributed files https://fedorahosted.org/freeipa/ticket/3855
-rw-r--r--freeipa.spec.in9
-rw-r--r--install/share/05rfc2247.ldif4
-rw-r--r--install/share/certmap.conf.template4
3 files changed, 9 insertions, 8 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 08090bddf..bffd95e1a 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -209,8 +209,9 @@ Requires(postun): %{_sbindir}/update-alternatives
Requires(preun): %{_sbindir}/update-alternatives
%description server-trust-ad
-Cross-realm trusts with Active Directory in IPA require working Samba 4 installation.
-This package is provided for convenience to install all required dependencies at once.
+Cross-realm trusts with Active Directory in IPA require working Samba 4
+installation. This package is provided for convenience to install all required
+dependencies at once.
%endif # ONLY_CLIENT
@@ -610,7 +611,7 @@ fi
%dir %attr(0700,apache,apache) %{_localstatedir}/run/ipa_memcached/
%dir %attr(0700,root,root) %{_localstatedir}/run/ipa/
# NOTE: systemd specific section
-%config %{_sysconfdir}/tmpfiles.d/ipa.conf
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/ipa.conf
%attr(644,root,root) %{_unitdir}/ipa.service
%attr(644,root,root) %{_unitdir}/ipa_memcached.service
%attr(644,root,root) %{_unitdir}/ipa-otpd.socket
@@ -803,7 +804,7 @@ fi
%{python_sitelib}/ipapython/platform/redhat/*.py*
%dir %{python_sitelib}/ipalib
%{python_sitelib}/ipalib/*
-%{python_sitearch}/default_encoding_utf8.so
+%attr(0644,root,root) %{python_sitearch}/default_encoding_utf8.so
%{python_sitelib}/ipapython-*.egg-info
%{python_sitelib}/freeipa-*.egg-info
%{python_sitearch}/python_default_encoding-*.egg-info
diff --git a/install/share/05rfc2247.ldif b/install/share/05rfc2247.ldif
index e02de3083..50cf84efe 100644
--- a/install/share/05rfc2247.ldif
+++ b/install/share/05rfc2247.ldif
@@ -9,8 +9,8 @@
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
+# this Program; if not, write to the Free Software Foundation, Inc., 51 Franklin
+# Street, Fifth Floor, Boston, MA 02110-1301, USA
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
diff --git a/install/share/certmap.conf.template b/install/share/certmap.conf.template
index 7beb5070f..69fce34f2 100644
--- a/install/share/certmap.conf.template
+++ b/install/share/certmap.conf.template
@@ -13,8 +13,8 @@
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
+# this Program; if not, write to the Free Software Foundation, Inc., 51 Franklin
+# Street, Fifth Floor, Boston, MA 02110-1301, USA
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU