From 168aea2990de6e3db4ffa7b203ce7ec368820ae7 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:48:44 +0000 Subject: auto-import changelog data from kdegraphics-2.2.2-3.src.rpm Sat Dec 21 2002 Than Ngo 2.2.2-3 - Multiple URL and filename vulnerabilities --- diff --git a/kdegraphics.spec b/kdegraphics.spec index bc8cc62..2e39fb9 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -1,11 +1,23 @@ -%define sourcedir stable/%{version}/distribution/tar/generic/source +%define kde_version 2.2.2 +%define qt_version 2.3.0 + +%define sourcedir stable/%{kde_version}/distribution/tar/generic/source + %define is_release 1 %define beta %{nil} -%define rel 2.1 + +%define rel 3 %define DATE 20010805 -Version: 2.2.2 Name: kdegraphics +Version: %{kde_version} +Icon: kde-icon.xpm +Summary: K Desktop Environment - Graphics Applications +Epoch: 7 +Group: Applications/Multimedia +BuildRoot: %{_tmppath}/%{name}-buildroot +License: GPL + %if %{is_release} %if "%{beta}" != "" Release: 0.%{beta}.%{rel} @@ -18,17 +30,20 @@ Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{version}.tar.bz2 Release: 0.cvs%{DATE}.%{rel} Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{DATE}.tar.bz2 %endif -Patch: kdegraphics-2.2.2-buffer2.patch -Icon: kde-icon.xpm -Summary: K Desktop Environment - Graphics Applications -Epoch: 7 -Group: Applications/Multimedia -BuildRoot: %{_tmppath}/%{name}-buildroot -License: GPL + +Patch: post-2.2.2-kdegraphics.diff + %ifnarch s390 s390x BuildRequires: sane-backends-devel >= 1.0.3-10 %endif -BuildRequires: kdelibs-devel >= 2.2-0.alpha1.0 zlib-devel libjpeg-devel libpng-devel kdelibs-sound-devel fam-devel libtiff-devel + +BuildRequires: kdelibs-devel >= %{kde_version} +BuildRequires: zlib-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: kdelibs-sound-devel +BuildRequires: fam-devel +BuildRequires: libtiff-devel %description Graphics applications for the K Desktop Environment. @@ -50,35 +65,41 @@ Install kdegraphics-devel if you wish to develop or compile applications that use kdegraphics. %prep -rm -rf $RPM_BUILD_ROOT - %if %{is_release} %setup -q %else %setup -q -n %{name} %endif -%patch -p1 -b .buffer - -test -f Makefile.cvs && make -f Makefile.cvs +%patch -p1 -b .sec %build export KDEDIR=%{_prefix} 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 +test -f Makefile.cvs && make -f Makefile.cvs + +CFLAGS="$RPM_OPT_FLAGS" \ +CXXFLAGS="$RPM_OPT_FLAGS -fno-check-new" \ +./configure \ + --prefix=%{_prefix} \ + --enable-final \ + --includedir=%{_includedir}/kde + make %{?smp_mflags} %install +rm -rf $RPM_BUILD_ROOT + make install-strip DESTDIR=$RPM_BUILD_ROOT -cd $RPM_BUILD_ROOT/usr/share/doc/HTML/en +pushd $RPM_BUILD_ROOT/usr/share/doc/HTML/en for i in *; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -sf ../common $i - fi + if [ -d $i -a -L $i/common ]; then + rm -f $i/common + ln -sf ../common $i + fi done +popd %clean rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name} $RPM_BUILD_DIR/%{name} @@ -96,10 +117,13 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name} $RPM_BUILD_DIR/%{name} %files devel %ifnarch s390 s390x %defattr(-,root,root) -%{_prefix}/include/kde/*.h +%{_includedir}/kde/*.h %endif %changelog +* Sat Dec 21 2002 Than Ngo 2.2.2-3 +- Multiple URL and filename vulnerabilities + * Tue Sep 24 2002 Bill Nottingham 2.2.2-2 - fix handling of some postscript/pdf headers in kghostview