SPECS: xpdf.spec - resolved conflict

[qboosh]

Author: qboosh                       Date: Wed Feb 14 21:44:51 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- resolved conflict

---- Files affected:
SPECS:
   xpdf.spec (1.105 -> 1.106) 

---- Diffs:

================================================================
Index: SPECS/xpdf.spec
diff -u SPECS/xpdf.spec:1.105 SPECS/xpdf.spec:1.106
--- SPECS/xpdf.spec:1.105	Mon Feb 12 23:09:25 2007
+++ SPECS/xpdf.spec	Wed Feb 14 22:44:46 2007
@@ -13,11 +13,7 @@
 Summary(uk.UTF-8):	Програма для перегляду PDF файлів
 Name:		xpdf
 Version:	3.01
-<<<<<<< xpdf.spec
-Release:	4.1
-=======
 Release:	5
->>>>>>> 1.103
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.foolabs.com/pub/xpdf/%{name}-%{version}.tar.gz
@@ -31,12 +27,8 @@
 Patch2:		%{name}-nonumericlocale.patch
 Patch3:		%{name}-%{version}pl2.patch
 Patch4:		%{name}-cve-2006-0301.patch
-<<<<<<< xpdf.spec
-Patch5:		%{name}-plfix.patch
-=======
 # http://www.freetype.org/freetype2/patches/xpdf-3.01-noftinternals.patch
 Patch5:		%{name}-noftinternals.patch
->>>>>>> 1.103
 URL:		http://www.foolabs.com/xpdf/
 %{?with_x:BuildRequires:	xorg-lib-libX11-devel}
 BuildRequires:	autoconf
@@ -179,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106  2007/02/14 21:44:46  qboosh
+- resolved conflict
+
 Revision 1.105  2007/02/12 22:09:25  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xpdf.spec?r1=1.105&r2=1.106&f=u