diff --git a/djvulibre.changes b/djvulibre.changes index 15da1c9..9322e13 100644 --- a/djvulibre.changes +++ b/djvulibre.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 13 15:21:34 UTC 2012 - pgajdos@suse.com + +- fix build for factory (define $QTDIR) + ------------------------------------------------------------------- Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de diff --git a/djvulibre.spec b/djvulibre.spec index e81c70c..c4d2f44 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,7 @@ # # spec file for package djvulibre # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,8 +18,8 @@ Name: djvulibre -BuildRequires: fdupes libdrm-devel libjpeg-devel libtiff-devel qt3-devel qt3-devel-tools update-desktop-files xorg-x11-devel -License: GPLv2+ +BuildRequires: autoconf fdupes libdrm-devel libjpeg-devel libtiff-devel libtool qt3-devel qt3-devel-tools update-desktop-files xorg-x11-devel +License: GPL-2.0+ Group: Productivity/Graphics/Other Version: 3.5.24 Release: 5 @@ -46,7 +46,7 @@ by hundreds of academic, commercial, governmental, and noncommercial Web sites around the world. %package djview3 -License: GPLv2+ +License: GPL-2.0+ Summary: DjView3 is a portable DjVu Qt3 based viewer and browser plugin Group: Productivity/Graphics/Other Requires: djvulibre = %{version} @@ -57,7 +57,7 @@ DjView3 is a viewer and browser plugin for DjVu documents, based on the DjVuLibre-3.5 library and the Qt3 toolkit. %package -n libdjvulibre21 -License: GPLv2+ +License: GPL-2.0+ Summary: Libraries of Open Source Implementation of DjVu - djvulibre Group: Productivity/Graphics/Other @@ -65,7 +65,7 @@ Group: Productivity/Graphics/Other Libraries of Open Source Implementation of DjVu - djvulibre. %package -n libdjvulibre-devel -License: GPLv2+ +License: GPL-2.0+ Summary: Libraries of Open Source Implementation of DjVu - djvulibre Group: Development/Libraries/Other Requires: libdjvulibre21 = %{version}, libjpeg-devel @@ -74,7 +74,7 @@ Requires: libdjvulibre21 = %{version}, libjpeg-devel Libraries of Open Source Implementation of DjVu - djvulibre. %package doc -License: GPLv2+ +License: GPL-2.0+ Summary: Documentation for the the DjVu - djvulibre Group: Productivity/Graphics/Other @@ -92,9 +92,10 @@ rm -rf doc/minilisp/.cvsignore %build # specifying --x-libraries and -includes is needed due to new paths in X.org 7.x # delete them if builds against X.org 6.9 or lower +export QTDIR=/usr/%{_lib}/qt3 CFLAGS="$RPM_OPT_FLAGS -I$QTDIR/include -Wall" \ CXXFLAGS="$RPM_OPT_FLAGS -I$QTDIR/include -Wall -fmessage-length=0 -fno-strict-aliasing" \ -QT_LIBS="-L/usr/%_lib/qt3/%{_lib} -lqt-mt" \ +QT_LIBS="-L$QTDIR/%{_lib} -lqt-mt" \ ./configure \ --prefix=%{_prefix} \ --libdir=%{_libdir} \