rpms/kdegraphics/FC-4 kdegraphics-3.5.1-warning.patch, NONE, 1.1 kdegraphics.spec, 1.54, 1.55 sources, 1.29, 1.30 kdegraphics-3.5.1-kpdf.patch, 1.1, NONE post-3.5.1-kdegraphics-CVE-2006-0301.diff, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Apr 12 09:39:44 UTC 2006


Author: than

Update of /cvs/dist/rpms/kdegraphics/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv32715

Modified Files:
	kdegraphics.spec sources 
Added Files:
	kdegraphics-3.5.1-warning.patch 
Removed Files:
	kdegraphics-3.5.1-kpdf.patch 
	post-3.5.1-kdegraphics-CVE-2006-0301.diff 
Log Message:
update to 3.5.2


kdegraphics-3.5.1-warning.patch:
 kpcursorlightcross.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdegraphics-3.5.1-warning.patch ---
--- kdegraphics-3.5.1/kolourpaint/cursors/kpcursorlightcross.cpp.orig	2006-02-07 12:10:45.000000000 +0100
+++ kdegraphics-3.5.1/kolourpaint/cursors/kpcursorlightcross.cpp	2006-02-07 12:10:52.000000000 +0100
@@ -52,7 +52,8 @@
     const int MaskOpaque = 1;
     const int MaskTransparent = 0;
 
-    int colorValue, maskValue;
+    int colorValue = ColorWhite;
+    int maskValue = MaskTransparent;
 
     switch (pv)
     {


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-4/kdegraphics.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdegraphics.spec	7 Feb 2006 10:58:27 -0000	1.54
+++ kdegraphics.spec	12 Apr 2006 09:39:41 -0000	1.55
@@ -3,22 +3,27 @@
 %define debug 0
 %define final 0
 
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
+
 %define kpovmodeler 0
 %define kfract 0
 %define arts 1
 %define make_cvs 1
 
+%define appdir %{_datadir}/applications/kde
+
 %define no_scanner_archs s390 s390x
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 0.2.fc4
+Version: 3.5.2
+Release: 0.1.fc4
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
 Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{rfelease}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 License: GPL
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -26,12 +31,7 @@
 Patch0: kde-libtool.patch
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
-
-# upstream fixes
-Patch50: kdegraphics-3.5.1-kpdf.patch
-
-# security fixes
-Patch100: post-3.5.1-kdegraphics-CVE-2006-0301.diff
+Patch3: kdegraphics-3.5.1-warning.patch
 
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
@@ -51,8 +51,8 @@
 BuildRequires: fribidi-devel 
 BuildRequires: libieee1284-devel
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
 
 Prereq: /sbin/ldconfig
 
@@ -267,12 +267,7 @@
 %patch0 -p1 -b .libtool
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
-
-# upstream patches
-%patch50 -p1 -b .kpdf
-
-# security patches
-%patch100 -p0 -b .CVE-2006-0301
+%patch3 -p1 -b .warning
 
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
@@ -289,10 +284,6 @@
 %endif
 
 %build
-export PATH=`pwd`:$PATH
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export KDEDIR=%{_prefix}
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
@@ -313,22 +304,22 @@
    --disable-debug \
    --disable-warnings \
 %endif
-   --includedir=/usr/include/kde \
-   --with-xinerama \
+   --includedir=%{_includedir}/kde \
 %ifnarch %{no_scanner_archs}
---with-kamera \
+   --with-kamera \
 %else
-   --without-kamera
+   --without-kamera \
 %endif
+   --with-xinerama
 
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -337,12 +328,12 @@
 done
 popd
 
-if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop ] ; then
-  echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop
-fi
+for i in kcmkmrml ksnapshot ; do
+  [ -f %{buildroot}%{appdir}/$i.desktop ] && echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
+done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -358,11 +349,12 @@
 %{_datadir}/applications/kde/*
 %{_datadir}/applnk/*
 %{_datadir}/apps/*
-%{_datadir}/config/*
 %{_datadir}/config.kcfg/*
+%ifnarch %{no_scanner_archs}
+%{_datadir}/config/*
+%endif
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/text/*
-%{_datadir}/mimelnk/image/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 
@@ -371,6 +363,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Tue Feb 07 2006 Than Ngo <than at redhat.com> 7:3.5.1-0.2.fc4
 - apply patch to fix buffer overflow in kpdf, CVE-2006-0301 (#179056)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-4/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	1 Feb 2006 19:32:17 -0000	1.29
+++ sources	12 Apr 2006 09:39:41 -0000	1.30
@@ -1 +1 @@
-2cd1c5348b7df46cf7f9d91e1dbfebd2  kdegraphics-3.5.1.tar.bz2
+8e1816a2191ea85b889930159a5d1e46  kdegraphics-3.5.2.tar.bz2


--- kdegraphics-3.5.1-kpdf.patch DELETED ---


--- post-3.5.1-kdegraphics-CVE-2006-0301.diff DELETED ---




More information about the fedora-cvs-commits mailing list