Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 52753 invoked from network); 10 Feb 2006 04:09:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Feb 2006 04:09:23 -0000 Received: (qmail 84784 invoked by uid 500); 10 Feb 2006 04:09:23 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 84748 invoked by uid 500); 10 Feb 2006 04:09:23 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 84736 invoked by uid 99); 10 Feb 2006 04:09:22 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Feb 2006 20:09:22 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 09 Feb 2006 20:09:22 -0800 Received: (qmail 52670 invoked by uid 65534); 10 Feb 2006 04:09:02 -0000 Message-ID: <20060210040902.52669.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r376539 - /directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java Date: Fri, 10 Feb 2006 04:09:01 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Thu Feb 9 20:08:59 2006 New Revision: 376539 URL: http://svn.apache.org/viewcvs?rev=376539&view=rev Log: fix for RPM builder Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java?rev=376539&r1=376538&r2=376539&view=diff ============================================================================== --- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java (original) +++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java Thu Feb 9 20:08:59 2006 @@ -347,8 +347,10 @@ if ( noticeFile.exists() ) { filterProperties.put( "install.notice.file", "install -m 644 " - + target.getLayout().getBaseDirectory() + "/NOTICE.txt $RPM_BUILD_ROOT/usr/local/${app}-%{version}" ); - filterProperties.put( "verify.notice.file", "/usr/local/${app}-%{version}/NOTICE.txt" ); + + target.getLayout().getBaseDirectory() + "/NOTICE.txt $RPM_BUILD_ROOT/usr/local/" + + target.getApplication().getName() + "-%{version}" ); + filterProperties.put( "verify.notice.file", "/usr/local/" + + target.getApplication().getName() + "-%{version}/NOTICE.txt" ); } else {