rpms/dogtag-pki-tps-ui/EL-5 dogtag-pki-tps-ui-tarfileset.patch, NONE, 1.1 dogtag-pki-tps-ui.spec, 1.1, 1.2

Dennis Gilmore ausil at fedoraproject.org
Wed Jan 20 16:35:11 UTC 2010


Author: ausil

Update of /cvs/pkgs/rpms/dogtag-pki-tps-ui/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18186

Modified Files:
	dogtag-pki-tps-ui.spec 
Added Files:
	dogtag-pki-tps-ui-tarfileset.patch 
Log Message:
add patch for ants stricter syntax


dogtag-pki-tps-ui-tarfileset.patch:
 build.xml |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE dogtag-pki-tps-ui-tarfileset.patch ---
--- 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}">


Index: dogtag-pki-tps-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-tps-ui/EL-5/dogtag-pki-tps-ui.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dogtag-pki-tps-ui.spec	20 Jan 2010 02:03:43 -0000	1.1
+++ dogtag-pki-tps-ui.spec	20 Jan 2010 16:35:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-tps-ui
 Version:        1.3.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Dogtag Certificate System - Token Processing System User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2 and LGPLv2
@@ -17,6 +17,7 @@ Provides:       pki-tps-ui =  %{version}
 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
@@ -28,6 +29,7 @@ user interface for the Dogtag Token Proc
 %prep
 
 %setup -q
+%patch0 -p1
 
 %build
 ant \
@@ -50,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Wed Jan 20 2010 Dennis Gilmore <dennis at ausil.us> - 1.3.0-6
+- add patch to deal with stricter syntax in ant 1.6.5
+
 * Mon Jan 18 2010 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-5
 - Bugzilla Bug #553851 - New Package for Dogtag PKI: dogtag-pki-tps-ui
 - Fixed various licensing headers



More information about the scm-commits mailing list