rpms/poppler/devel poppler.spec,1.108,1.109

[Marek Kašík]

Author: mkasik

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29992

Modified Files:
	poppler.spec 
Log Message:
* Fri Jan 15 2010 Marek Kasik <mkasik at redhat.com> - 0.12.3-3
- Correct permissions of goo/GooTimer.h
- Convert pdftohtml.1 to utf8
- Make the pdftohtml's Provides/Obsoletes versioned



Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- poppler.spec	11 Jan 2010 17:06:02 -0000	1.108
+++ poppler.spec	15 Jan 2010 13:42:23 -0000	1.109
@@ -2,7 +2,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.12.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -99,8 +99,8 @@ Group: Applications/Text
 Requires: %{name} = %{version}-%{release}
 %if 0%{?fedora} < 11 && 0%{?rhel} < 6
 #  last seen in fc8
-Provides: pdftohtml
-Obsoletes: pdftohtml
+Provides: pdftohtml > 0.36-10.fc8
+Obsoletes: pdftohtml <= 0.36-10.fc8
 #  last seen in fc7
 Provides: xpdf-utils = 1:3.01-27.fc7
 Obsoletes: xpdf-utils <= 1:3.01-26.fc7
@@ -119,6 +119,11 @@ converting PDF files to a number of othe
 
 %patch100 -p1 -b .objstream
 
+chmod -x goo/GooTimer.h
+
+iconv -f iso-8859-1 -t utf-8 < "utils/pdftohtml.1" > "utils/pdftohtml.1.utf8"
+mv "utils/pdftohtml.1.utf8" "utils/pdftohtml.1"
+
 # hammer to nuke rpaths, recheck on new releases
 autoreconf -i -f
 
@@ -216,6 +221,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 15 2010 Marek Kasik <mkasik at redhat.com> - 0.12.3-3
+- Correct permissions of goo/GooTimer.h
+- Convert pdftohtml.1 to utf8
+- Make the pdftohtml's Provides/Obsoletes versioned
+
 * Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.12.3-1
 - poppler-0.12.3