diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-01-21 00:04:41 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-01-21 00:04:41 +0000 |
commit | 77677d528c57e0648ee149176fa87447c25292b0 (patch) | |
tree | e206a992a14000a4f980f9eafcc5ee0a5a52b56b /pki/dogtag/tps-ui | |
parent | 8dd0aa9601f390308446f4cdd41279f10a323ebe (diff) | |
download | pki-77677d528c57e0648ee149176fa87447c25292b0.tar.gz pki-77677d528c57e0648ee149176fa87447c25292b0.tar.xz pki-77677d528c57e0648ee149176fa87447c25292b0.zip |
fixed "tarfileset" typo
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@932 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/dogtag/tps-ui')
-rw-r--r-- | pki/dogtag/tps-ui/build.xml | 8 | ||||
-rwxr-xr-x | pki/dogtag/tps-ui/build_dogtag | 2 | ||||
-rw-r--r-- | pki/dogtag/tps-ui/dogtag-pki-tps-ui-tarfileset.patch | 17 | ||||
-rw-r--r-- | pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec | 9 |
4 files changed, 10 insertions, 26 deletions
diff --git a/pki/dogtag/tps-ui/build.xml b/pki/dogtag/tps-ui/build.xml index 0ecc93397..2fc35e8e4 100644 --- a/pki/dogtag/tps-ui/build.xml +++ b/pki/dogtag/tps-ui/build.xml @@ -164,11 +164,11 @@ <include name="**"/> <exclude name="cgi-bin/sow/cfg.pl"/> </tarfileset> - <zipfileset dir="./shared" - filemode="755" - prefix="usr/share/${product.prefix}/${product}"> + <tarfileset dir="./shared" + mode="755" + prefix="${dist.name}/usr/share/${product.prefix}/${product}"> <include name="cgi-bin/sow/cfg.pl"/> - </zipfileset> + </tarfileset> <tarfileset dir="." mode="644" prefix="${dist.name}/usr/share/doc/${dist.name}"> diff --git a/pki/dogtag/tps-ui/build_dogtag b/pki/dogtag/tps-ui/build_dogtag index 52311aaca..1e42e11a5 100755 --- a/pki/dogtag/tps-ui/build_dogtag +++ b/pki/dogtag/tps-ui/build_dogtag @@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki" export PKI_PRODUCT_PREFIX PKI_PRODUCT="tps-ui" export PKI_PRODUCT -PKI_VERSION="1.3.0" +PKI_VERSION="1.3.1" export PKI_VERSION # Set Dogtag helper variables diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui-tarfileset.patch b/pki/dogtag/tps-ui/dogtag-pki-tps-ui-tarfileset.patch deleted file mode 100644 index 73e05c0ac..000000000 --- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui-tarfileset.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- dogtag-pki-tps-ui-1.3.0/build.xml.orig 2010-01-20 10:30:49.999697227 -0600 -+++ dogtag-pki-tps-ui-1.3.0/build.xml 2010-01-20 10:31:09.738446656 -0600 -@@ -164,11 +164,11 @@ - <include name="**"/> - <exclude name="cgi-bin/sow/cfg.pl"/> - </tarfileset> -- <zipfileset dir="./shared" -- filemode="755" -+ <tarfileset dir="./shared" -+ mode="755" - prefix="usr/share/${product.prefix}/${product}"> - <include name="cgi-bin/sow/cfg.pl"/> -- </zipfileset> -+ </tarfileset> - <tarfileset dir="." - mode="644" - prefix="${dist.name}/usr/share/doc/${dist.name}"> diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec index 036f266b4..f81c239e9 100644 --- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec +++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec @@ -1,6 +1,6 @@ Name: dogtag-pki-tps-ui -Version: 1.3.0 -Release: 6%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: Dogtag Certificate System - Token Processing System User Interface URL: http://pki.fedoraproject.org/ License: GPLv2 and LGPLv2 @@ -17,7 +17,6 @@ Provides: pki-tps-ui = %{version}-%{release} Obsoletes: pki-tps-ui < %{version}-%{release} Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz -Patch0: dogtag-pki-tps-ui-tarfileset.patch %description Dogtag Certificate System is an enterprise software system designed @@ -29,7 +28,6 @@ user interface for the Dogtag Token Processing System. %prep %setup -q -%patch0 -p1 %build ant \ @@ -52,6 +50,9 @@ rm -rf %{buildroot} %{_datadir}/pki/ %changelog +* Wed Jan 20 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-1 +- fixed "tarfileset" typo + * Wed Jan 20 2010 Dennis Gilmore <dennis@ausil.us> - 1.3.0-6 - add patch to deal with stricter syntax in ant 1.6.5 |