rpms/kdegraphics/devel kdegraphics-3.5.2-kpdf-xft.patch, NONE, 1.1 kdegraphics.spec, 1.76, 1.77 sources, 1.32, 1.33 kdegraphics-3.5.1-kpdf-xft.patch, 1.1, NONE 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]

Author: than

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

Modified Files:
	kdegraphics.spec sources 
Added Files:
	kdegraphics-3.5.2-kpdf-xft.patch 
Removed Files:
	kdegraphics-3.5.1-kpdf-xft.patch 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.2-kpdf-xft.patch:
 configure.in.in |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE kdegraphics-3.5.2-kpdf-xft.patch ---
--- kdegraphics-3.5.2/kpdf/configure.in.in.kpdf-xft	2006-03-17 11:11:19.000000000 +0100
+++ kdegraphics-3.5.2/kpdf/configure.in.in	2006-04-04 17:54:13.000000000 +0200
@@ -40,6 +40,9 @@
   if "$XFT_CONFIG"; then
     XFT_CFLAGS="`$XFT_CONFIG --cflags`"
     XFT_LIBS="`$XFT_CONFIG --libs`"
+  else
+    XFT_CFLAGS="`pkg-config xft --cflags 2>/dev/null`"
+    XFT_LIBS="`pkg-config xft --libs 2>/dev/null`"
   fi
   AC_SUBST(XFT_CFLAGS)
   AC_SUBST(XFT_LIBS)


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kdegraphics.spec	14 Mar 2006 13:10:48 -0000	1.76
+++ kdegraphics.spec	5 Apr 2006 17:38:01 -0000	1.77
@@ -11,17 +11,19 @@
 %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: 4
+Version: 3.5.2
+Release: 1
 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
@@ -30,15 +32,9 @@
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
 Patch3: kdegraphics-3.5.1-warning.patch
-Patch4: kdegraphics-3.5.1-kpdf-xft.patch
+Patch4: kdegraphics-3.5.2-kpdf-xft.patch
 Patch5: kdegraphics-3.5.1-gphoto2-config.patch
 
-# upstream patches
-Patch50: kdegraphics-3.5.1-kpdf.patch
-
-# security patches
-Patch100: post-3.5.1-kdegraphics-CVE-2006-0301.diff
-
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
 BuildRequires: gphoto2-devel
@@ -276,18 +272,11 @@
 %patch4 -p1 -b .kpdf-xft
 %patch5 -p1 -b .gphoto2-config
 
-# upstream patches
-%patch50 -p1 -b .kpdf
-
-# security patches
-%patch100 -p0 -b .CVE-2006-0301
-
 %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
 %endif
 
-# disable kpovmodeler temporary. waiting for freeglut
 %if !%{kpovmodeler}
    echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kpovmodeler\"" >kpovmodeler/configure.in.in
 %endif
@@ -321,13 +310,13 @@
 %if %{final}
    --enable-final \
 %endif
-   --includedir=/usr/include/kde \
-   --with-xinerama \
+   --includedir=%{_includedir}/kde \
 %ifnarch %{no_scanner_archs}
    --with-kamera \
 %else
-   --without-kamera
+   --without-kamera \
 %endif
+   --with-xinerama
 
 make %{?_smp_mflags}
 
@@ -345,9 +334,9 @@
 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 $RPM_BUILD_ROOT%{appdir}/$i.desktop ] && echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{appdir}/$i.desktop
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -379,6 +368,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 7:3.5.2-1
+- update to 3.5.2
+
 * Tue Mar 14 2006 Than Ngo <than at redhat.com> 7:3.5.1-4
 - fix build problem with gphoto2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	4 Feb 2006 23:16:53 -0000	1.32
+++ sources	5 Apr 2006 17:38:01 -0000	1.33
@@ -1 +1 @@
-2cd1c5348b7df46cf7f9d91e1dbfebd2  kdegraphics-3.5.1.tar.bz2
+8e1816a2191ea85b889930159a5d1e46  kdegraphics-3.5.2.tar.bz2


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


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


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