diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-02 18:53:01 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-02 18:53:01 +0000 |
commit | 91bdb46eccdc419c64a74702f022fec310c3664b (patch) | |
tree | c1b867050044b2302b59f4462d20364c18e57a77 /pki/base/ra | |
parent | 5ef22989a67da780f246e1799fe51c026ab9c995 (diff) | |
download | pki-91bdb46eccdc419c64a74702f022fec310c3664b.tar.gz pki-91bdb46eccdc419c64a74702f022fec310c3664b.tar.xz pki-91bdb46eccdc419c64a74702f022fec310c3664b.zip |
Bugzilla Bug #643206 - New CMake based build system for Dogtag
(Legacy build system changes for compliance)
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1597 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/ra')
-rw-r--r-- | pki/base/ra/build.xml | 6 | ||||
-rw-r--r-- | pki/base/ra/setup/config.desktop | 31 | ||||
-rw-r--r-- | pki/base/ra/setup/config.desktop.in | 2 |
3 files changed, 4 insertions, 35 deletions
diff --git a/pki/base/ra/build.xml b/pki/base/ra/build.xml index a3a3a85a4..67f35af09 100644 --- a/pki/base/ra/build.xml +++ b/pki/base/ra/build.xml @@ -26,7 +26,7 @@ outputproperty="config.desktop.version"> <arg value="-pi -e"/> <arg value="s/Version=.*/Version=${version}/"/> - <arg value="setup/config.desktop"/> + <arg value="setup/config.desktop.in"/> </exec> @@ -156,7 +156,7 @@ <zipfileset dir="./setup" filemode="644" prefix="usr/share/${product.prefix}/${product}/setup"> - <include name="config.desktop"/> + <include name="config.desktop.in"/> <include name="registry_instance"/> </zipfileset> <zipfileset dir="./etc/init.d" @@ -213,7 +213,7 @@ <tarfileset dir="./setup" mode="644" prefix="${dist.name}/usr/share/${product.prefix}/${product}/setup"> - <include name="config.desktop"/> + <include name="config.desktop.in"/> <include name="registry_instance"/> </tarfileset> <tarfileset dir="./etc/init.d" diff --git a/pki/base/ra/setup/config.desktop b/pki/base/ra/setup/config.desktop deleted file mode 100644 index 30935ef83..000000000 --- a/pki/base/ra/setup/config.desktop +++ /dev/null @@ -1,31 +0,0 @@ -# --- BEGIN COPYRIGHT BLOCK --- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Copyright (C) 2007 Red Hat, Inc. -# All rights reserved. -# --- END COPYRIGHT BLOCK --- -# -[Desktop Entry] -Version=1.0.0 -Encoding=UTF-8 -Name=Registration Authority Configuration - [PKI_INSTANCE_ID] -GenericName=Registration Authority Configuration -Comment=Configure Registration Authority -Exec=firefox https://[SERVER_NAME]:[SECURE_PORT]/ra/admin/console/config/login?pin=[PKI_RANDOM_NUMBER] -Icon=firefox.png -Terminal=false -Type=Application -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; -X-Desktop-File-Install-Version=0.9 -Categories=Application;CertServer; diff --git a/pki/base/ra/setup/config.desktop.in b/pki/base/ra/setup/config.desktop.in index 8b602d5a8..241f89b1c 100644 --- a/pki/base/ra/setup/config.desktop.in +++ b/pki/base/ra/setup/config.desktop.in @@ -19,7 +19,7 @@ [Desktop Entry] Version=@VERSION@ Encoding=UTF-8 -Name=Registration Authority Configuration - [INSTANCE_ID] +Name=Registration Authority Configuration - [PKI_INSTANCE_ID] GenericName=Registration Authority Configuration Comment=Configure Registration Authority Exec=firefox https://[SERVER_NAME]:[SECURE_PORT]/ra/admin/console/config/login?pin=[PKI_RANDOM_NUMBER] |