rpms/poppler
7
0
Fork 0
Code Issues Pull Requests Releases Activity

more qt check fixes

Browse Source
This commit is contained in:
Matthias Clasen 2007-12-03 02:15:23 +00:00
parent 184c74081d
commit 9f09bda7e3
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
poppler-qt3-check.patch
View File

@ -1,6 +1,7 @@
--- poppler-0.6.2/poppler-0.6.2/configure.orig 2007-11-29 12:09:57.000000000 +0100 diff -up poppler-0.6.2/poppler-0.6.2/configure.qt3-check poppler-0.6.2/poppler-0.6.2/configure
+++ poppler-0.6.2/poppler-0.6.2/configure 2007-11-29 12:20:49.000000000 +0100 --- poppler-0.6.2/poppler-0.6.2/configure.qt3-check 2007-11-10 07:04:36.000000000 -0500
@@ -25816,8 +25816,8 @@ +++ poppler-0.6.2/poppler-0.6.2/configure 2007-12-02 21:14:01.000000000 -0500
@@ -26165,8 +26165,8 @@ fi
if test x$enable_poppler_qt = xyes; then if test x$enable_poppler_qt = xyes; then
@ -11,3 +12,15 @@
if test -n "$QTDIR" ; then if test -n "$QTDIR" ; then
qt_incdirs="$QTDIR/include $qt_incdirs" qt_incdirs="$QTDIR/include $qt_incdirs"
qt_libdirs="$QTDIR/lib $qt_libdirs" qt_libdirs="$QTDIR/lib $qt_libdirs"
@@ -26192,11 +26192,6 @@ echo "${ECHO_T}$qt_incdir" >&6; }
echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6; }
qt_libdir="no"
for qt_check in $qt_libdirs ; do
- if test -r "$qt_check/$qt_test_la_library" ; then
- qt_libdir="$qt_check"
- break
- fi
-
if test -r "$qt_check/$qt_test_library" ; then
qt_libdir="$qt_check"
break

5
poppler.spec
View File

@ -3,7 +3,7 @@
Summary: PDF rendering library Summary: PDF rendering library
Name: poppler Name: poppler
Version: 0.6.2 Version: 0.6.2
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2 and Redistributable, no modification permitted License: GPLv2 and Redistributable, no modification permitted
# the code is GPLv2 # the code is GPLv2
# the charmap data in /usr/share/poppler is redistributable # the charmap data in /usr/share/poppler is redistributable
@ -172,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Sun Dec 2 2007 Matthias Clasen <mclasen@redhat.com> - 0.6.2-3
- Fix the qt3 checks some more
* Thu Nov 28 2007 Matthias Clasen <mclasen@redhat.com> - 0.6.2-2 * Thu Nov 28 2007 Matthias Clasen <mclasen@redhat.com> - 0.6.2-2
- package xpdf headers in poppler-devel (Jindrich Novy) - package xpdf headers in poppler-devel (Jindrich Novy)
- Fix qt3 detection (Denis Leroy) - Fix qt3 detection (Denis Leroy)