rpms/xca/devel xca.spec,1.30,1.31

[ensc]

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10188

Modified Files:
	xca.spec 
Log Message:
updated to 0.7.0; rediffed patches



Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- xca.spec	26 Aug 2009 14:21:51 -0000	1.30
+++ xca.spec	13 Sep 2009 11:21:17 -0000	1.31
@@ -2,8 +2,8 @@
 
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
-Version:	0.6.4
-Release:	%release_func 9
+Version:	0.7.0
+Release:	%release_func 0
 
 License:	BSD
 Group:		Applications/Productivity
@@ -11,8 +11,7 @@ URL:		http://www.hohnstaedt.de/xca.html
 Source0:	http://download.sourceforge.net/sourceforge/xca/%name-%version.tar.gz
 Source1:	README.update
 Source4:	xca.xml
-Patch0:		xca-0.6.3-locale.patch
-Patch1:         xca-0.6.4-newopenssl.patch
+Patch0:		xca-0.7.0-locale.patch
 Patch2:         xca-0.6.4-includes.patch
 Patch3:		xca-0.6.4-openssl10.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
@@ -39,13 +38,17 @@ PEM, DER, PKCS#8.
 
 %prep
 %setup -q
-%patch0 -p1 -b .locale
-%patch1 -p1 -b .newopenssl
-%patch2 -p1 -b .includes
-%patch3 -p1 -b .openssl10
+%if 0
+quilt import %PATCH0 %PATCH2 %PATCH3
+quilt push -a
+%else
+%patch0 -p1
+%patch2 -p1
+%patch3 -p1
+%endif
 
-mkdir -p _tmp_root/usr 	 
-ln -s /usr/%_lib	_tmp_root/usr/lib 	 
+mkdir -p _tmp_root/usr
+ln -s /usr/%_lib	_tmp_root/usr/lib
 ln -s /%_lib		_tmp_root/lib
 ln -s %_includedir/Qt	_tmp_root/include
 
@@ -119,6 +122,7 @@ gtk-update-icon-cache %_datadir/icons/hi
 %_bindir/*
 %attr(0644,root,root) %_mandir/*/*
 %dir %{_datadir}/xca
+%_datadir/pixmaps/*.xpm
 %_datadir/xca/*.png
 %_datadir/xca/*.txt
 %_datadir/xca/*.html
@@ -132,6 +136,9 @@ gtk-update-icon-cache %_datadir/icons/hi
 
 
 %changelog
+* Sun Sep 13 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.7.0-0
+- updated to 0.7.0; rediffed patches
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.4-9
 - rebuilt with new openssl