- Correct permissions of goo/GooTimer.h

- Convert pdftohtml.1 to utf8
- Make the pdftohtml's Provides/Obsoletes versioned
This commit is contained in:
mkasik 2010-01-15 13:42:23 +00:00
parent e6623b1d9d
commit 2de6df6571

View File

@ -2,7 +2,7 @@
Summary: PDF rendering library Summary: PDF rendering library
Name: poppler Name: poppler
Version: 0.12.3 Version: 0.12.3
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2 License: GPLv2
Group: Development/Libraries Group: Development/Libraries
URL: http://poppler.freedesktop.org/ URL: http://poppler.freedesktop.org/
@ -99,8 +99,8 @@ Group: Applications/Text
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%if 0%{?fedora} < 11 && 0%{?rhel} < 6 %if 0%{?fedora} < 11 && 0%{?rhel} < 6
# last seen in fc8 # last seen in fc8
Provides: pdftohtml Provides: pdftohtml > 0.36-10.fc8
Obsoletes: pdftohtml Obsoletes: pdftohtml <= 0.36-10.fc8
# last seen in fc7 # last seen in fc7
Provides: xpdf-utils = 1:3.01-27.fc7 Provides: xpdf-utils = 1:3.01-27.fc7
Obsoletes: xpdf-utils <= 1:3.01-26.fc7 Obsoletes: xpdf-utils <= 1:3.01-26.fc7
@ -119,6 +119,11 @@ converting PDF files to a number of other formats.
%patch100 -p1 -b .objstream %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 # hammer to nuke rpaths, recheck on new releases
autoreconf -i -f autoreconf -i -f
@ -216,6 +221,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Jan 15 2010 Marek Kasik <mkasik@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@fedoraproject.org> - 0.12.3-1 * Thu Jan 07 2010 Rex Dieter <rdieter@fedoraproject.org> - 0.12.3-1
- poppler-0.12.3 - poppler-0.12.3