diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-02-19 01:29:38 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-02-19 01:29:38 +0000 |
| commit | fe06e652d6e0b5a945fc3502d3cefc7dadcfdc12 (patch) | |
| tree | ea00a1c628e96bc08d4bd033cf6de30defda23d5 /pki/dogtag | |
| parent | e8dccd568ba414ee38e06cd0ec725997f57a905b (diff) | |
| download | pki-fe06e652d6e0b5a945fc3502d3cefc7dadcfdc12.tar.gz pki-fe06e652d6e0b5a945fc3502d3cefc7dadcfdc12.tar.xz pki-fe06e652d6e0b5a945fc3502d3cefc7dadcfdc12.zip | |
Bugzilla Bug #678142 - Flakey JAR packaging encountered on Fedora 15 when
using Mock
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1858 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/dogtag')
| -rw-r--r-- | pki/dogtag/console-ui/build.xml | 6 | ||||
| -rw-r--r-- | pki/dogtag/console-ui/src/CMSAdminRS.properties (renamed from pki/dogtag/console-ui/CMSAdminRS.properties) | 0 | ||||
| -rw-r--r-- | pki/dogtag/console-ui/src/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pki/dogtag/console-ui/build.xml b/pki/dogtag/console-ui/build.xml index 068a23d31..a472d1782 100644 --- a/pki/dogtag/console-ui/build.xml +++ b/pki/dogtag/console-ui/build.xml @@ -60,7 +60,7 @@ <echo message="${begin.build.jars.log.message}"/> <mkdir dir="${build.jars}"/> <jar jarfile="${build.jars}/pki-console-theme-${version}.jar"> - <fileset dir="."> + <fileset dir="${src.dir}"> <include name="CMSAdminRS.properties"/> </fileset> <fileset dir="${build.classes}"> @@ -222,10 +222,10 @@ <include name="${product.name}.spec"/> <include name="LICENSE"/> <include name="build.xml"/> - <include name="CMSAdminRS.properties"/> <include name="config/product*.xml"/> <include name="config/release*.xml"/> <include name="release"/> + <include name="src/CMSAdminRS.properties"/> <include name="src/**"/> </zipfileset> </zip> @@ -240,10 +240,10 @@ <include name="${product.name}.spec"/> <include name="LICENSE"/> <include name="build.xml"/> - <include name="CMSAdminRS.properties"/> <include name="config/product*.xml"/> <include name="config/release*.xml"/> <include name="release"/> + <include name="src/CMSAdminRS.properties"/> <include name="src/**"/> </tarfileset> </tar> diff --git a/pki/dogtag/console-ui/CMSAdminRS.properties b/pki/dogtag/console-ui/src/CMSAdminRS.properties index e42104937..e42104937 100644 --- a/pki/dogtag/console-ui/CMSAdminRS.properties +++ b/pki/dogtag/console-ui/src/CMSAdminRS.properties diff --git a/pki/dogtag/console-ui/src/CMakeLists.txt b/pki/dogtag/console-ui/src/CMakeLists.txt index b2288d5f7..bc8995a12 100644 --- a/pki/dogtag/console-ui/src/CMakeLists.txt +++ b/pki/dogtag/console-ui/src/CMakeLists.txt @@ -1,7 +1,7 @@ set(pki-console-theme_java Java) set(pki-console-theme_java_RCS - ../CMSAdminRS.properties + CMSAdminRS.properties com/netscape/management/client/theme/theme.properties com/netscape/management/client/theme/images/login.gif com/netscape/management/client/theme/images/ConsoleBanner.gif |