Hello community, here is the log from the commit of package poppler checked in at Fri Jan 12 01:34:57 CET 2007. -------- --- GNOME/poppler/poppler.changes 2006-10-26 22:48:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/poppler/poppler.changes 2007-01-10 14:47:22.000000000 +0100 @@ -1,0 +2,24 @@ +Tue Jan 2 16:11:08 CET 2007 - sbrabec@suse.cz + +- Fixed qt detection (#229896). +- Fixed dependencies. +- Reverted poppler-qt3 back to poppler-qt (#229896). + +------------------------------------------------------------------- +Fri Dec 29 10:39:55 GMT 2006 - james@usr-local-bin.org + +- New subpackage: poppler-qt4 +- Rename poppler-qt to be poppler-qt3 + +------------------------------------------------------------------- +Sat Dec 23 09:23:25 GMT 2006 - james@usr-local-bin.org + +- Add wildcard to use QT3 and QT4 bindings + +------------------------------------------------------------------- +Tue Dec 19 18:51:25 CET 2006 - sbrabec@suse.cz + +- Spec file cleanup. +- Splitted poppler-doc from poppler. + +------------------------------------------------------------------- New: ---- poppler-qt-m4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.Cd8667/_old 2007-01-12 01:33:00.000000000 +0100 +++ /var/tmp/diff_new_pack.Cd8667/_new 2007-01-12 01:33:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package poppler (Version 0.5.4) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,14 +11,15 @@ # norootforbuild Name: poppler -BuildRequires: gtk2-devel libdrm-devel libjpeg-devel qt3-devel update-desktop-files +BuildRequires: gtk-doc gtk2-devel libdrm-devel libjpeg-devel libqt4-devel qt-devel qt3-devel update-desktop-files zlib-devel Version: 0.5.4 -Release: 11 +Release: 30 URL: http://poppler.freedesktop.org/ Group: System/Libraries -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Summary: PDF Rendering Library Source: %{name}-%{version}.tar.bz2 +Patch: poppler-qt-m4.patch Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,7 +58,7 @@ %package devel Group: System/Libraries Summary: PDF rendering library -Requires: %{name} = %{version} glib2-devel gtk2-devel cairo-devel qt3-devel libjpeg-devel libstdc++-devel +Requires: %{name} = %{version} glib2-devel gtk2-devel cairo-devel qt3-devel libjpeg-devel libqt4-devel libstdc++-devel %description devel Poppler is a fork of the xpdf PDF viewer developed by Derek Noonburg of @@ -204,34 +205,100 @@ Derek Noonburg <derekn@foolabs.com> Kristian H�gsberg <krh@bitplanet.net> +%package qt4 +Group: System/Libraries +Summary: PDF rendering library - a qt4 wrapper +Requires: %{name} = %{version} + +%description qt4 +Poppler is a fork of the xpdf PDF viewer developed by Derek Noonburg of +Glyph and Cog, LLC. The purpose of forking xpdf is twofold. First, we +want to provide PDF rendering functionality as a shared library, to +centralize the maintenence effort. Today a number of applications +incorporate the xpdf code base, and whenever a security issue is +discovered, all these applications exchange patches and put out new +releases. In turn, all distributions must package and release new +version of these xpdf based viewers. It's safe to say that there's a +lot of duplicated effort with the current situation. Even if poppler +in the short term introduces yet another xpdf derived code base to the +world, we hope that over time these applications will adopt poppler. +After all, we only need one application to use poppler to break even. + +Second, we would like to move libpoppler forward in a number of areas +that doesn't fit within the goals of xpdf. By design, xpdf depends on +very few libraries and runs a wide range of X based platforms. This is +a strong feature and reasonable design goal. However, with poppler we +would like to replace parts of xpdf that are now available as standard +components of modern Unix desktop environments. One such example is +fontconfig, which solves the problem of matching and locating fonts on +the system, in a standardized and well understood way. Another example +is cairo, which provides high quality 2D rendering. See the file TODO +for a list of planned changes. + + + +Authors: +-------- + Derek Noonburg <derekn@foolabs.com> + Kristian H�gsberg <krh@bitplanet.net> + +%package doc +Group: System/Libraries +Summary: Additional Package Documentation. +Requires: %{name} = %{version} + +%description doc +Poppler is a fork of the xpdf PDF viewer developed by Derek Noonburg of +Glyph and Cog, LLC. The purpose of forking xpdf is twofold. First, to +provide PDF rendering functionality as a shared library to centralize +the maintenence effort. Today a number of applications incorporate the +xpdf code base and whenever a security issue is discovered, all these +applications exchange patches and put out new releases. In turn, all +distributions must package and release new versions of these xpdf based +viewers. It is safe to say that there is a lot of duplicated effort +with the current situation. Even if poppler in the short term +introduces yet another xpdf-derived code base to the world, it is hoped +that over time these applications will adopt poppler. After all, only +one application needs to use poppler to break even. + +Second, libpoppler intends to move forward in a number of areas that do +not fit within the goals of xpdf. By design, xpdf depends on very few +libraries and runs on a wide range of X-based platforms. This is a +strong feature and reasonable design goal. However, poppler intends to +replace parts of xpdf that are now available as standard components of +modern Unix desktop environments. One such example is fontconfig, +which solves the problem of matching and locating fonts on the system +in a standardized and well understood way. Another example is cairo, +which provides high quality 2D rendering. See the file TODO for a list +of planned changes. + + + +Authors: +-------- + Derek Noonburg <derekn@foolabs.com> + Kristian H�gsberg <krh@bitplanet.net> + %prep %setup +%patch %build +ACLOCAL="aclocal -I m4" autoreconf -f -i +# needed for poppler-0.5.4: +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %if %suse_version > 1000 -export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector -fno-strict-aliasing" +export CFLAGS="$RPM_OPT_FLAGS -fstack-protector" +#export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector" +export CXXFLAGS="$CXXFLAGS -fstack-protector" %endif -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" -# Work-around linking problems: -export LDFLAGS="-fPIC" -# Work-around biarch problems: -unset QTDIR -export QTINC=/usr/%{_lib}/qt3/include -export QTLIB=/usr/%{_lib}/qt3/%{_lib} -./configure\ - --prefix=/usr \ - --libdir=/usr/%{_lib} \ - --mandir=%{_mandir} \ - --enable-xpdf-headers \ - --sysconfdir=/etc -make %{?jobs:-j %jobs} +%configure\ + --enable-xpdf-headers\ + --enable-zlib +make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/opt/gnome/share -mv $RPM_BUILD_ROOT/%{_datadir}/gtk-doc $RPM_BUILD_ROOT/opt/gnome/share/ +make install DESTDIR=$RPM_BUILD_ROOT %post %run_ldconfig @@ -242,6 +309,9 @@ %post qt %run_ldconfig +%post qt4 +%run_ldconfig + %postun %run_ldconfig @@ -251,33 +321,55 @@ %postun qt %run_ldconfig +%postun qt4 +%run_ldconfig + %files %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO -/usr/%{_lib}/libpoppler.so.* -/opt/gnome/share/gtk-doc/html/poppler +%{_libdir}/libpoppler.so.* %files tools %defattr (-, root, root) -/usr/bin/* -%{_mandir}/man1/*.1.gz +%{_bindir}/* +%doc %{_mandir}/man1/*.* %files glib %defattr (-, root, root) -/usr/%{_lib}/libpoppler-glib.so.* +%{_libdir}/libpoppler-glib.so.* %files qt %defattr (-, root, root) -/usr/%{_lib}/libpoppler-qt.so.* +%{_libdir}/libpoppler-qt.so.* + +%files qt4 +%defattr (-, root, root) +%{_libdir}/libpoppler-qt4.so.* %files devel %defattr (-, root, root) -/usr/%{_lib}/*.*a -/usr/%{_lib}/*.so -/usr/%{_lib}/pkgconfig/*.pc -/usr/include/poppler +%{_includedir}/poppler +%{_libdir}/*.so +%{_libdir}/*.*a +%{_libdir}/pkgconfig/*.pc + +%files doc +%defattr (-, root, root) +%{_datadir}/gtk-doc/html/poppler %changelog -n poppler +* Tue Jan 02 2007 - sbrabec@suse.cz +- Fixed qt detection (#229896). +- Fixed dependencies. +- Reverted poppler-qt3 back to poppler-qt (#229896). +* Fri Dec 29 2006 - james@usr-local-bin.org +- New subpackage: poppler-qt4 +- Rename poppler-qt to be poppler-qt3 +* Sat Dec 23 2006 - james@usr-local-bin.org +- Add wildcard to use QT3 and QT4 bindings +* Tue Dec 19 2006 - sbrabec@suse.cz +- Spec file cleanup. +- Splitted poppler-doc from poppler. * Thu Oct 26 2006 - jhargadon@suse.de - added --sysconfdir=/etc option to ./configure in the specfile as another part of the fix for bug #201739 ++++++ poppler-qt-m4.patch ++++++ --- m4/qt.m4 +++ m4/qt.m4 @@ -8,7 +8,7 @@ [ dnl Search paths for Qt qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include" -qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib" +qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib/qt3/lib64 /usr/lib64/qt3/lib64 /usr/lib/qt/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64" if test -n "$QTDIR" ; then qt_incdirs="$QTDIR/include $qt_incdirs" qt_libdirs="$QTDIR/lib $qt_libdirs" @@ -100,7 +100,7 @@ have_qt4=no dnl Search paths for Qt4 - not much real experience with this yet. qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include" -qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib" +qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib /usr/lib/qt/lib /usr/share/qt4/lib /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib/qt4/lib64 /usr/lib64/qt4/lib64 /usr/lib/qt/lib64 /usr/lib64/qt/lib64 /usr/share/qt4/lib64" if test -n "$QTDIR" ; then qt4_incdirs="$QTDIR/include $qt4_incdirs" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org