diff --git a/.cvsignore b/.cvsignore index 37cc2f0..ebdf012 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -kdegraphics-3.0.0.tar.bz2 +kdegraphics-3.0.3.tar.bz2 libgpio-20011225.tar.bz2 diff --git a/kdegraphics.spec b/kdegraphics.spec index 1a662d8..d4eac6f 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -1,9 +1,9 @@ %define sourcedir stable/%{version}/distribution/tar/generic/source %define is_release 1 %define beta %{nil} -%define rel 5a +%define rel 0.7.1 %define DATE 20020326 -Version: 3.0.0 +Version: 3.0.3 Name: kdegraphics %if %{is_release} @@ -20,6 +20,7 @@ Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{DATE}.tar.bz2 %endif Source1: cvs://anonymous@cvs.gphoto.sourceforge.net/cvsroot/gphoto/libgpio-20011225.tar.bz2 Source900: gccver.c +Patch: kdegraphics-3.0.3-buffer.patch Icon: kde-icon.xpm Summary: K Desktop Environment - Graphics Applications Epoch: 7 @@ -29,10 +30,7 @@ License: GPL %ifnarch s390 s390x BuildRequires: sane-backends-devel >= 1.0.3-10 %endif -BuildRequires: kdelibs-devel >= 3.0.0-0 zlib-devel libjpeg-devel libpng-devel libtiff-devel imlib-devel -%ifnarch s390 s390x -BuildRequires: gphoto2-devel -%endif +BuildRequires: kdelibs-devel >= 3.0.0-0 zlib-devel libjpeg-devel libpng-devel libtiff-devel imlib-devel gphoto2-devel %description Graphics applications for the K Desktop Environment. @@ -42,7 +40,6 @@ files); kfract (a fractal generator); kghostview (displays postscript files); kiconedit (icon editor); kpaint (a simple drawing program); ksnapshot (screen capture utility); kview (image viewer for GIF, JPEG, TIFF, etc.). -%ifnarch s390 s390x %package -n kamera Summary: Digital camera support for KDE Group: Applications/Multimedia @@ -52,7 +49,6 @@ Requires: gphoto2 Kamera adds support for digital cameras to KDE. After installing kamera, you can access your digital camera just like a filesystem from KDE applications. -%endif %package -n kcoloredit Summary: KDE palette editor and color chooser @@ -219,18 +215,19 @@ you wish to develop or compile applications using libkscan. rm -rf $RPM_BUILD_ROOT %if %{is_release} -%ifnarch alpha s390 s390x +%ifnarch alpha %setup -q -a 1 %else %setup -q %endif %else -%ifnarch alpha s390 s390x +%ifnarch alpha %setup -q -n %{name} -a 1 %else %setup -q -n %{name} %endif %endif +%patch -p1 -b .buffer # Workaround for legacy auto* tools [ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf @@ -243,7 +240,7 @@ export PATH=`pwd`:$PATH test -f Makefile.cvs && make -f Makefile.cvs %build -%ifnarch alpha s390 s390x +%ifnarch alpha # Build libgpio first, we want kamera... cd libgpio ./autogen.sh @@ -260,7 +257,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS -fno-check-new" \ ./configure --prefix=%{_prefix} --enable-final --includedir=/usr/include/kde \ --with-xinerama \ -%ifnarch alpha s390 s390x +%ifnarch alpha --with-kamera --with-gpio-includes=$RPM_BUILD_ROOT%{_includedir}/gpio --with-gpio-libraries=$RPM_BUILD_ROOT%{_libdir} %else --without-kamera @@ -292,7 +289,7 @@ done %post -n libkscan -p /sbin/ldconfig %postun -n libkscan -p /sbin/ldconfig -%ifnarch alpha s390 s390x +%ifnarch alpha %post -n kamera -p /sbin/ldconfig %postun -n kamera -p /sbin/ldconfig @@ -463,6 +460,12 @@ done %endif %changelog +* Tue Sep 24 2002 Bill Nottingham 3.0.3-0.7.1 +- fix handling of some postscript/pdf headers in kghostview + +* Wed Aug 14 2002 Bernhard Rosenkraenzer 3.0.3-1 +- 3.0.3 + * Tue Apr 16 2002 Bernhard Rosenkraenzer 3.0.0-5 - rename libraries diff --git a/sources b/sources index c6d27d9..da70e2a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1576adc141e62caf1aa42b57f57fecc1 kdegraphics-3.0.0.tar.bz2 +9c3b99cec43dccd3957158ee32573da1 kdegraphics-3.0.3.tar.bz2 099a85087800df7af7552e3b16890916 libgpio-20011225.tar.bz2