diff --git a/kdegraphics.spec b/kdegraphics.spec index 44f0d72..cda05d7 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -9,26 +9,19 @@ %define no_scanner_archs s390 s390x -Version: 3.3.2 -Release: 0.4 +Version: 3.3.92 +Release: 0.1 Name: kdegraphics Summary: K Desktop Environment - Graphics Applications Epoch: 7 Group: Applications/Multimedia -BuildRoot: %{_tmppath}/%{name}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%buildroot License: GPL Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch0: kde-libtool.patch Patch1: kdegraphics-3.3.0-misc.patch Patch2: kdegraphics-3.3.1-xorg.patch -Patch3: kdegraphics-3.3.2-immodule.patch - -# security fix -# CAN-2004-1125 -Patch100: post-3.3.2-kdegraphics.diff -# CAN-2005-0064 -Patch101: post-3.3.2-kdegraphics-3.diff %ifnarch %{no_scanner_archs} BuildRequires: sane-backends-devel >= 1.0.3-10 @@ -263,15 +256,10 @@ This package contains a model editor for the PovRay raytracer. %patch0 -p1 -b .libtool %patch1 -p1 -b .misc %patch2 -p1 -b .xorg -%patch3 -p1 -b .im - -#security fix -%patch100 -p0 -b .CAN-2004-1125 -%patch101 -p0 -b .CAN-2005-0064 %if %{rhel} -echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in -echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in + echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in + echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in %endif @@ -313,7 +301,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -pushd $RPM_BUILD_ROOT/usr/share/doc/HTML/en +pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en for i in *; do if [ -d $i -a -L $i/common ]; then rm -f $i/common @@ -338,22 +326,26 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so* %{_libdir}/*.la %{_libdir}/kde3/* -%{_datadir}/icons/*/*/*/* +%{_datadir}/applications/kde/* +%{_datadir}/applnk/* +%{_datadir}/apps/* %ifnarch %{no_scanner_archs} %{_datadir}/config/* %endif +%{_datadir}/config.kcfg/* +%{_datadir}/icons/*/*/*/* +%{_datadir}/mimelnk/text/* %{_datadir}/services/* %{_datadir}/servicetypes/* -%{_datadir}/apps/* -%{_datadir}/mimelnk/text/* -%{_datadir}/applications/kde/* -%{_datadir}/applnk/* %files devel %defattr(-,root,root) %{_includedir}/kde/* %changelog +* Tue Feb 22 2005 Than Ngo 7:3.3.92-0.1 +- KDE-3.4 beta2 + * Sat Feb 12 2005 Than Ngo 7:3.3.2-0.4 - backport from CVS for working with qt-immodule