- resolved conflict

Changed files:
    xpdf.spec -> 1.106

diff --git a/xpdf.spec b/xpdf.spec
index 82040fe59bd73dc8d86d919cb2057d86582bf654..d95db346e5f3fcce8f9ce2b8daf473234c38d8a1 100644 (file)
--- a/xpdf.spec
+++ b/xpdf.spec
@@ -12,11 +12,7 @@ Summary(ru.UTF-8):   Программа для просмотра PDF файлов
 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
@@ -30,12 +26,8 @@ Patch1:              %{name}-fontdirs.patch
 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