subject:"\[Freeipa\-devel\] \[freeipa PR#233\]\[synchronized\] Build phase 6\: %install cleanup"

[Freeipa-devel] [freeipa PR#233][synchronized] Build phase 6: %install cleanup

2016-11-11 Thread pspacek

   URL: https://github.com/freeipa/freeipa/pull/233
Author: pspacek
 Title: #233: Build phase 6: %install cleanup
Action: synchronized

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/233/head:pr233
git checkout pr233
From c26ff5d4de8eaef7430382f5aacc9bc2df39b43c Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Thu, 10 Nov 2016 12:07:03 +0100
Subject: [PATCH 1/4] Build: move client directory handling from SPEC to
 Makefile.am

This is next step towards fully functional make install.

https://fedorahosted.org/freeipa/ticket/6418
---
 client/Makefile.am | 3 +++
 freeipa.spec.in| 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/Makefile.am b/client/Makefile.am
index 0a451e5..4c29ee7 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -122,3 +122,6 @@ MAINTAINERCLEANFILES =		\
 	version.m4		\
 	$(NULL)
 
+install-data-hook:
+	$(INSTALL) -d -m 755 $(DESTDIR)$(IPA_SYSCONF_DIR)/nssdb
+	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/lib/ipa-client/sysrestore
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 7dbbf87..4e39b3c 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -804,11 +804,8 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup
 %endif # ONLY_CLIENT
 
-mkdir -p %{buildroot}%{_sysconfdir}/ipa/
 /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf
 /bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt
-mkdir -p %{buildroot}%{_sysconfdir}/ipa/nssdb
-mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore
 
 %if ! %{ONLY_CLIENT}
 mkdir -p %{buildroot}%{_sysconfdir}/cron.d

From efa9861cd95ff213f083db09cd68e16a16b01db3 Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Thu, 10 Nov 2016 12:45:26 +0100
Subject: [PATCH 2/4] Build: move server directory handling from SPEC to
 Makefile.am

This is next step towards fully functional make install.

https://fedorahosted.org/freeipa/ticket/6418
---
 freeipa.spec.in |  8 
 install/Makefile.am | 11 +--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 4e39b3c..68fc2bc 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -741,8 +741,6 @@ sed -i -e'1s/python\(3\|$\)/python2/' %{buildroot}%{_bindir}/ipa
 
 %find_lang %{gettext_domain}
 
-mkdir -p %{buildroot}%{_usr}/share/ipa
-
 %if ! %{ONLY_CLIENT}
 # Remove .la files from libtool - we don't want to package
 # these files
@@ -793,7 +791,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con
-mkdir -p %{buildroot}%{_initrddir}
 
 # Web UI plugin dir
 mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins
@@ -801,7 +798,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins
 mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5
 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 
-mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup
 %endif # ONLY_CLIENT
 
 /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf
@@ -818,10 +814,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.d
 sed -e 's,\.py.*$,.*,g' | sort -u | \
 sed -e 's,\./,%%{python_sitelib}/ipatests/,g' ) >tests-python.list
 
-mkdir -p %{buildroot}%{_sysconfdir}/ipa/custodia
-
-mkdir -p %{buildroot}%{_usr}/share/ipa/schema.d
-
 %endif # ONLY_CLIENT
 
 
diff --git a/install/Makefile.am b/install/Makefile.am
index 2dcd927..64219c5 100644
--- a/install/Makefile.am
+++ b/install/Makefile.am
@@ -19,12 +19,11 @@ SUBDIRS =			\
 	$(NULL)
 
 install-exec-local:
-	mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
-	chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
-	mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade
-	chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade
-	mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca
-	chmod 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca
+	$(INSTALL) -d -m 700 $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia
+	$(INSTALL) -d -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/backup
+	$(INSTALL) -d -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
+	$(INSTALL) -d -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade
+	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca
 
 uninstall-local:
 	-rmdir $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore

From 68449e46ab7adb899161c107d16aa5d0f5145b4a Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Thu, 10 Nov 2016 14:39:59 +0100
Subject: [PATCH 3/4] Build: move web UI file installation from SPEC to
 Makefile.am

This is next step towards fully functional make install.

https://fedorahosted.org/freeipa/ticket/6418
---
 freeipa.spec.in  | 19 ---
 install/html/Makefile.am | 14 ++
 install/ui/Makefile.am   |  3 +++
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/freeipa.spe

[Freeipa-devel] [freeipa PR#233][synchronized] Build phase 6: %install cleanup

2016-11-11 Thread pspacek

   URL: https://github.com/freeipa/freeipa/pull/233
Author: pspacek
 Title: #233: Build phase 6: %install cleanup
Action: synchronized

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/233/head:pr233
git checkout pr233
From 66ce562f3146e7febddc8241ad2cf51986f3d6b3 Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Thu, 10 Nov 2016 12:07:03 +0100
Subject: [PATCH 1/4] Build: move client directory handling from SPEC to
 Makefile.am

This is next step towards fully functional make install.

https://fedorahosted.org/freeipa/ticket/6418
---
 client/Makefile.am | 3 +++
 freeipa.spec.in| 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/Makefile.am b/client/Makefile.am
index 0a451e5..45abdf6 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -122,3 +122,6 @@ MAINTAINERCLEANFILES =		\
 	version.m4		\
 	$(NULL)
 
+install-data-hook:
+	$(INSTALL) -d -D -m 755 $(DESTDIR)$(IPA_SYSCONF_DIR)/nssdb
+	$(INSTALL) -d -D -m 755 $(DESTDIR)$(localstatedir)/lib/ipa-client/sysrestore
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 7dbbf87..4e39b3c 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -804,11 +804,8 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup
 %endif # ONLY_CLIENT
 
-mkdir -p %{buildroot}%{_sysconfdir}/ipa/
 /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf
 /bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt
-mkdir -p %{buildroot}%{_sysconfdir}/ipa/nssdb
-mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore
 
 %if ! %{ONLY_CLIENT}
 mkdir -p %{buildroot}%{_sysconfdir}/cron.d

From 5bdde096b0d8443fd4c40b8d146530dbf06b63d1 Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Thu, 10 Nov 2016 12:45:26 +0100
Subject: [PATCH 2/4] Build: move server directory handling from SPEC to
 Makefile.am

This is next step towards fully functional make install.

https://fedorahosted.org/freeipa/ticket/6418
---
 freeipa.spec.in |  8 
 install/Makefile.am | 11 +--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 4e39b3c..68fc2bc 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -741,8 +741,6 @@ sed -i -e'1s/python\(3\|$\)/python2/' %{buildroot}%{_bindir}/ipa
 
 %find_lang %{gettext_domain}
 
-mkdir -p %{buildroot}%{_usr}/share/ipa
-
 %if ! %{ONLY_CLIENT}
 # Remove .la files from libtool - we don't want to package
 # these files
@@ -793,7 +791,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con
-mkdir -p %{buildroot}%{_initrddir}
 
 # Web UI plugin dir
 mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins
@@ -801,7 +798,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins
 mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5
 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 
-mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup
 %endif # ONLY_CLIENT
 
 /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf
@@ -818,10 +814,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.d
 sed -e 's,\.py.*$,.*,g' | sort -u | \
 sed -e 's,\./,%%{python_sitelib}/ipatests/,g' ) >tests-python.list
 
-mkdir -p %{buildroot}%{_sysconfdir}/ipa/custodia
-
-mkdir -p %{buildroot}%{_usr}/share/ipa/schema.d
-
 %endif # ONLY_CLIENT
 
 
diff --git a/install/Makefile.am b/install/Makefile.am
index 2dcd927..0dca193 100644
--- a/install/Makefile.am
+++ b/install/Makefile.am
@@ -19,12 +19,11 @@ SUBDIRS =			\
 	$(NULL)
 
 install-exec-local:
-	mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
-	chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
-	mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade
-	chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade
-	mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca
-	chmod 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca
+	$(INSTALL) -d -D -m 700 $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia
+	$(INSTALL) -d -D -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/backup
+	$(INSTALL) -d -D -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
+	$(INSTALL) -d -D -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade
+	$(INSTALL) -d -D -m 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca
 
 uninstall-local:
 	-rmdir $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore

From 88ed0655561efd8852f4c842a47182ae3b16515c Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Thu, 10 Nov 2016 14:39:59 +0100
Subject: [PATCH 3/4] Build: move web UI file installation from SPEC to
 Makefile.am

This is next step towards fully functional make install.

https://fedorahosted.org/freeipa/ticket/6418
---
 freeipa.spec.in  | 19 ---
 install/html/Makefile.am | 14 ++
 install/ui/Makefile.am   |  3 +++
 3 files changed, 17 insertions(+), 19 deletions(-)

dif

[Freeipa-devel] [freeipa PR#233][synchronized] Build phase 6: %install cleanup

2016-11-11 Thread pspacek

   URL: https://github.com/freeipa/freeipa/pull/233
Author: pspacek
 Title: #233: Build phase 6: %install cleanup
Action: synchronized

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/233/head:pr233
git checkout pr233
From 66ce562f3146e7febddc8241ad2cf51986f3d6b3 Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Thu, 10 Nov 2016 12:07:03 +0100
Subject: [PATCH 1/4] Build: move client directory handling from SPEC to
 Makefile.am

This is next step towards fully functional make install.

https://fedorahosted.org/freeipa/ticket/6418
---
 client/Makefile.am | 3 +++
 freeipa.spec.in| 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/Makefile.am b/client/Makefile.am
index 0a451e5..45abdf6 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -122,3 +122,6 @@ MAINTAINERCLEANFILES =		\
 	version.m4		\
 	$(NULL)
 
+install-data-hook:
+	$(INSTALL) -d -D -m 755 $(DESTDIR)$(IPA_SYSCONF_DIR)/nssdb
+	$(INSTALL) -d -D -m 755 $(DESTDIR)$(localstatedir)/lib/ipa-client/sysrestore
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 7dbbf87..4e39b3c 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -804,11 +804,8 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup
 %endif # ONLY_CLIENT
 
-mkdir -p %{buildroot}%{_sysconfdir}/ipa/
 /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf
 /bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt
-mkdir -p %{buildroot}%{_sysconfdir}/ipa/nssdb
-mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore
 
 %if ! %{ONLY_CLIENT}
 mkdir -p %{buildroot}%{_sysconfdir}/cron.d

From 5bdde096b0d8443fd4c40b8d146530dbf06b63d1 Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Thu, 10 Nov 2016 12:45:26 +0100
Subject: [PATCH 2/4] Build: move server directory handling from SPEC to
 Makefile.am

This is next step towards fully functional make install.

https://fedorahosted.org/freeipa/ticket/6418
---
 freeipa.spec.in |  8 
 install/Makefile.am | 11 +--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 4e39b3c..68fc2bc 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -741,8 +741,6 @@ sed -i -e'1s/python\(3\|$\)/python2/' %{buildroot}%{_bindir}/ipa
 
 %find_lang %{gettext_domain}
 
-mkdir -p %{buildroot}%{_usr}/share/ipa
-
 %if ! %{ONLY_CLIENT}
 # Remove .la files from libtool - we don't want to package
 # these files
@@ -793,7 +791,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con
-mkdir -p %{buildroot}%{_initrddir}
 
 # Web UI plugin dir
 mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins
@@ -801,7 +798,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins
 mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5
 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 
-mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup
 %endif # ONLY_CLIENT
 
 /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf
@@ -818,10 +814,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.d
 sed -e 's,\.py.*$,.*,g' | sort -u | \
 sed -e 's,\./,%%{python_sitelib}/ipatests/,g' ) >tests-python.list
 
-mkdir -p %{buildroot}%{_sysconfdir}/ipa/custodia
-
-mkdir -p %{buildroot}%{_usr}/share/ipa/schema.d
-
 %endif # ONLY_CLIENT
 
 
diff --git a/install/Makefile.am b/install/Makefile.am
index 2dcd927..0dca193 100644
--- a/install/Makefile.am
+++ b/install/Makefile.am
@@ -19,12 +19,11 @@ SUBDIRS =			\
 	$(NULL)
 
 install-exec-local:
-	mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
-	chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
-	mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade
-	chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade
-	mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca
-	chmod 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca
+	$(INSTALL) -d -D -m 700 $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia
+	$(INSTALL) -d -D -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/backup
+	$(INSTALL) -d -D -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
+	$(INSTALL) -d -D -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade
+	$(INSTALL) -d -D -m 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca
 
 uninstall-local:
 	-rmdir $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore

From 6d1f25c8ddb4cf25970205e507181bcd2240be4e Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Thu, 10 Nov 2016 14:39:59 +0100
Subject: [PATCH 3/4] Build: move web UI file installation from SPEC to
 Makefile.am

This is next step towards fully functional make install.

https://fedorahosted.org/freeipa/ticket/6418
---
 freeipa.spec.in  | 19 ---
 install/html/Makefile.am | 14 ++
 install/ui/Makefile.am   |  3 +++
 3 files changed, 17 insertions(+), 19 deletions(-)

dif

[Freeipa-devel] [freeipa PR#233][synchronized] Build phase 6: %install cleanup

2016-11-11 Thread pspacek

   URL: https://github.com/freeipa/freeipa/pull/233
Author: pspacek
 Title: #233: Build phase 6: %install cleanup
Action: synchronized

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/233/head:pr233
git checkout pr233
From 068652de356b6d69d13649da2920c870a97d82c5 Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Thu, 10 Nov 2016 12:07:03 +0100
Subject: [PATCH 1/4] Build: move client directory handling from SPEC to
 Makefile.am

This is next step towards fully functional make install.

https://fedorahosted.org/freeipa/ticket/6418
---
 client/Makefile.am | 3 +++
 freeipa.spec.in| 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/Makefile.am b/client/Makefile.am
index 0a451e5..45abdf6 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -122,3 +122,6 @@ MAINTAINERCLEANFILES =		\
 	version.m4		\
 	$(NULL)
 
+install-data-hook:
+	$(INSTALL) -d -D -m 755 $(DESTDIR)$(IPA_SYSCONF_DIR)/nssdb
+	$(INSTALL) -d -D -m 755 $(DESTDIR)$(localstatedir)/lib/ipa-client/sysrestore
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 7dbbf87..4e39b3c 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -804,11 +804,8 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup
 %endif # ONLY_CLIENT
 
-mkdir -p %{buildroot}%{_sysconfdir}/ipa/
 /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf
 /bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt
-mkdir -p %{buildroot}%{_sysconfdir}/ipa/nssdb
-mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore
 
 %if ! %{ONLY_CLIENT}
 mkdir -p %{buildroot}%{_sysconfdir}/cron.d

From 233f30612e34f76acded8e9d9c86e6425a3b6260 Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Thu, 10 Nov 2016 12:45:26 +0100
Subject: [PATCH 2/4] Build: move server directory handling from SPEC to
 Makefile.am

This is next step towards fully functional make install.

https://fedorahosted.org/freeipa/ticket/6418
---
 freeipa.spec.in | 8 
 install/Makefile.am | 4 
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 4e39b3c..68fc2bc 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -741,8 +741,6 @@ sed -i -e'1s/python\(3\|$\)/python2/' %{buildroot}%{_bindir}/ipa
 
 %find_lang %{gettext_domain}
 
-mkdir -p %{buildroot}%{_usr}/share/ipa
-
 %if ! %{ONLY_CLIENT}
 # Remove .la files from libtool - we don't want to package
 # these files
@@ -793,7 +791,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con
-mkdir -p %{buildroot}%{_initrddir}
 
 # Web UI plugin dir
 mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins
@@ -801,7 +798,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins
 mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5
 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 
-mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup
 %endif # ONLY_CLIENT
 
 /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf
@@ -818,10 +814,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.d
 sed -e 's,\.py.*$,.*,g' | sort -u | \
 sed -e 's,\./,%%{python_sitelib}/ipatests/,g' ) >tests-python.list
 
-mkdir -p %{buildroot}%{_sysconfdir}/ipa/custodia
-
-mkdir -p %{buildroot}%{_usr}/share/ipa/schema.d
-
 %endif # ONLY_CLIENT
 
 
diff --git a/install/Makefile.am b/install/Makefile.am
index 2dcd927..58d67c6 100644
--- a/install/Makefile.am
+++ b/install/Makefile.am
@@ -19,6 +19,10 @@ SUBDIRS =			\
 	$(NULL)
 
 install-exec-local:
+	mkdir -p $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia
+	chmod 700 $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia
+	mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/backup
+	chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/backup
 	mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
 	chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
 	mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade

From 9d45b4095d4f945efe8bf08f3899d2f14d9b2542 Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Thu, 10 Nov 2016 14:39:59 +0100
Subject: [PATCH 3/4] Build: move web UI file installation from SPEC to
 Makefile.am

This is next step towards fully functional make install.

https://fedorahosted.org/freeipa/ticket/6418
---
 freeipa.spec.in  | 19 ---
 install/html/Makefile.am | 13 +
 install/ui/Makefile.am   |  3 +++
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 68fc2bc..45d2896 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -763,28 +763,12 @@ rm %{buildroot}/%{plugin_dir}/libtopology.la
 rm %{buildroot}/%{_libdir}/krb5/plugins/kdb/ipadb.la
 rm %{buildroot}/%{_libdir}/samba/pdb/ipasam.la
 
-# Some user-modifiable HTML files are provided. Move these to /etc
-# and link back.
-mkdir -p %{bui

[Freeipa-devel] [freeipa PR#233][synchronized] Build phase 6: %install cleanup

[Freeipa-devel] [freeipa PR#233][synchronized] Build phase 6: %install cleanup

[Freeipa-devel] [freeipa PR#233][synchronized] Build phase 6: %install cleanup

[Freeipa-devel] [freeipa PR#233][synchronized] Build phase 6: %install cleanup

4 matches

Site Navigation

Mail list logo

Footer information