[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Pki-devel] [PATCH] 276 Cleaned up code to install man pages.



The code to install man pages in the spec file and CMake scripts
has been cleaned up for clarity.

Ticket #582

Note: Patch #271 will need to be rebased.

--
Endi S. Dewata
From a7b9f229cbaf4a297e34cb261bc8fa363e8e63fd Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata redhat com>
Date: Wed, 17 Jul 2013 12:56:41 -0400
Subject: [PATCH] Cleaned up code to install man pages.

The code to install man pages in the spec file and CMake scripts
has been cleaned up for clarity.

Ticket #582
---
 base/java-tools/CMakeLists.txt | 14 +++++++-------
 base/server/CMakeLists.txt     | 26 +++++++-------------------
 specs/pki-core.spec            |  9 ++++-----
 3 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/base/java-tools/CMakeLists.txt b/base/java-tools/CMakeLists.txt
index 430985d710eaced527a1291814856a6ebdca3f00..d34290690469117321195ff7ec97231dd4f65a4e 100644
--- a/base/java-tools/CMakeLists.txt
+++ b/base/java-tools/CMakeLists.txt
@@ -1,14 +1,14 @@
 project(java-tools NONE)
 
 install(
-    FILES
-        man/man1/pki.1
+    DIRECTORY
+        man/
     DESTINATION
-        ${MAN_INSTALL_DIR}/man1
-    PERMISSIONS
-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
-        GROUP_EXECUTE GROUP_READ
-        WORLD_EXECUTE WORLD_READ
+        ${MAN_INSTALL_DIR}
+    FILE_PERMISSIONS
+        OWNER_READ OWNER_WRITE
+        GROUP_READ
+        WORLD_READ
 )
 
 install(
diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt
index ddacbc1ad38fe69fa1e58738d38bd59abab950c0..e8f78c4fc02f40bc169b2b78dd45a2499fbf04ec 100644
--- a/base/server/CMakeLists.txt
+++ b/base/server/CMakeLists.txt
@@ -22,26 +22,14 @@ set(APACHE_SUBSYSTEMS
 )
 
 install(
-    FILES
-        man/man5/pki_default.cfg.5
+    DIRECTORY
+        man/
     DESTINATION
-        ${MAN_INSTALL_DIR}/man5
-    PERMISSIONS
-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
-        GROUP_EXECUTE GROUP_READ
-        WORLD_EXECUTE WORLD_READ
-)
-
-install(
-    FILES
-        man/man8/pkispawn.8
-        man/man8/pkidestroy.8
-    DESTINATION
-        ${MAN_INSTALL_DIR}/man8
-    PERMISSIONS
-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
-        GROUP_EXECUTE GROUP_READ
-        WORLD_EXECUTE WORLD_READ
+        ${MAN_INSTALL_DIR}
+    FILE_PERMISSIONS
+        OWNER_READ OWNER_WRITE
+        GROUP_READ
+        WORLD_READ
 )
 
 # install Python libraries
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 31754f54b7cefe1b3e7bd0adda0fcb0ed2ee9b1d..3dede1eaa30ba3c17a8fa7db52caf8631615410b 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -5,7 +5,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:             pki-core
 Version:          10.1.0
-Release:          0.5%{?dist}
+Release:          0.6%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -526,10 +526,6 @@ cd build
 cd build
 %{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
 
-chmod 644 %{buildroot}%{_mandir}/man1/*
-chmod 644 %{buildroot}%{_mandir}/man5/*
-chmod 644 %{buildroot}%{_mandir}/man8/*
-
 # Fedora 18 and 17:  Substitute 'tomcat7jss.jar' for 'tomcatjss.jar'
 %if ! 0%{?rhel} && 0%{?fedora} <= 18
 	sed -i -e 's/grant codeBase "file:\/usr\/share\/java\/tomcatjss.jar" {/grant codeBase "file:\/usr\/share\/java\/tomcat7jss.jar" {/' %{buildroot}%{_datadir}/pki/server/conf/pki.policy
@@ -1087,6 +1083,9 @@ fi
 
 
 %changelog
+* Wed Jul 17 2013 Endi S. Dewata <edewata redhat com> 10.1.0-0.6
+- Cleaned up the code to install man pages.
+
 * Tue Jul 16 2013 Endi S. Dewata <edewata redhat com> 10.1.0-0.5
 - Reorganized deployment tools.
 
-- 
1.8.1.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]