rpms/kdegraphics/F-8 .cvsignore, 1.35, 1.36 kdegraphics.spec, 1.116, 1.117 sources, 1.38, 1.39 post-3.5.8-kdegraphics-kpdf.diff, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27177

Modified Files:
	.cvsignore kdegraphics.spec sources 
Removed Files:
	post-3.5.8-kdegraphics-kpdf.diff 
Log Message:
* Fri Dec 15 2008 Rex Dieter <rdieter at fedoraproject.org> 7:3.5.9-1
- kde-3.5.9
- cleanup conditionals: extras(rhel), modular-x



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-8/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	13 Oct 2007 18:52:44 -0000	1.35
+++ .cvsignore	16 Feb 2008 03:25:20 -0000	1.36
@@ -1,2 +1 @@
-kdegraphics-3.5.7.tar.bz2
-kdegraphics-3.5.8.tar.bz2
+kdegraphics-3.5.9.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-8/kdegraphics.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- kdegraphics.spec	30 Jan 2008 11:00:50 -0000	1.116
+++ kdegraphics.spec	16 Feb 2008 03:25:20 -0000	1.117
@@ -3,16 +3,26 @@
 %define final 1
 %define make_cvs 0
 
-%if 0%{?fedora} > 7
 # make -libs subpkg
+%if 0%{?fedora} > 7
 %define libs 1
 %endif
 
+# make -extras subpkg
+%if 0%{!?rhel:1}
+%define extras 1
+%endif
+
+# modular X
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define mod_x 1
+%endif
+
 Name:    kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch:   7
-Version: 3.5.8
-Release: 8%{?dist}
+Version: 3.5.9
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -23,8 +33,6 @@
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
 Patch3: kdegraphics-3.5.1-warning.patch
-# http://www.kde.org/info/security/advisory-20071107-1.txt
-Patch4: ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.8-kdegraphics-kpdf.diff
 
 Provides: kdegraphics3 = %{version}-%{release}
 
@@ -41,7 +49,7 @@
 %endif
 
 BuildRequires: gettext
-BuildRequires: kdelibs3-devel >= %{version}
+#BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: libmng-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
@@ -56,16 +64,14 @@
 %endif
 
 # kgamma
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libXxf86vm-devel
-%endif
+%{?mod_x:BuildRequires: libXxf86vm-devel}
 # kuickshow
 BuildRequires: imlib-devel
 #kfile-plugin
 BuildRequires: OpenEXR-devel
 # kpdf
 BuildRequires: freetype-devel
-%if 0%{?fedora} > 5 || 0%{?rhel} > 4 
+%if 0%{?fedora} > 5 || 0%{?rhel} > 5 
 BuildRequires: poppler-qt-devel
 BuildRequires: libpaper-devel
 %endif
@@ -74,12 +80,12 @@
 BuildRequires: fribidi-devel
 BuildRequires: lcms-devel
 BuildRequires: libart_lgpl-devel
-BuildRequires: libXmu-devel
+%{?mod_x:BuildRequires: libXmu-devel}
 # kpovmodeler
-%if 0%{!?rhel:1}
-BuildRequires: libGL-devel
-BuildRequires: libGLU-devel
-BuildRequires: libXi-devel
+%if 0%{?extras}
+%{?mod_x:BuildRequires: libGL-devel libGLU-devel libXi-devel}
+%else
+Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %if 0%{?make_cvs}
@@ -107,16 +113,20 @@
 %description devel
 %{summary}.
 
+%if 0%{?extras}
 ## FIXME: move more stuff to -extras
 %package extras
 Summary: Extra applications from %{name} 
 Group: Applications/Multimedia
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 %description extras
 %{summary}, including:
 * kfax
 * kfaxview
 * kpovmodler
+%endif
 
 %if 0%{?libs}
 %package libs
@@ -137,10 +147,9 @@
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
 %patch3 -p1 -b .gcc-warning
-%patch4 -p0 -b .CVE-2007-4352-5392-5393
 
 
-%if 0%{!?rhel:1}
+%if ! 0%{?extras}
   DO_NOT_COMPILE=""
   export DO_NOT_COMPILE="$DO_NOT_COMPILE kfax"
   export DO_NOT_COMPILE="$DO_NOT_COMPILE kfaxview"
@@ -201,7 +210,7 @@
     if test -s "$dir/$file" ; then
        install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
        # exclude for RHEL
-%if 0%{!?rhel:1}
+%if ! 0%{?extras}
        [ $dir != kfax -a $dir != kfaxview -a $dir != kpovmodeler ] && \
 %endif
        echo "%doc rpmdocs/$dir/" >> %{name}.lang
@@ -240,8 +249,7 @@
 %postun libs -p /sbin/ldconfig
 %endif
 
-
-%if 0%{!?rhel:1}
+%if 0%{?extras}
 %post extras
 /sbin/ldconfig ||:
 for f in crystalsvg hicolor ; do
@@ -300,7 +308,7 @@
 %doc AUTHORS COPYING README
 %doc rpmdocs/*
 
-%if 0%{!?rhel:1}
+%if 0%{?extras}
 # kfax
 %exclude %{_bindir}/kfax
 %exclude %{_datadir}/applications/kde/kfax.desktop
@@ -361,7 +369,11 @@
 
 
 %changelog
-* Wed Jan 30 2008 Than Ngo <than at redhat.com> 3.5.8-8
+* Fri Dec 15 2008 Rex Dieter <rdieter at fedoraproject.org> 7:3.5.9-1
+- kde-3.5.9
+- cleanup conditionals: extras(rhel), modular-x
+
+* Wed Jan 30 2008 Than Ngo <than at redhat.com> - 7:3.5.8-8
 - fix #350071, kooka requires gocr
 
 * Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-8/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	13 Oct 2007 18:52:44 -0000	1.38
+++ sources	16 Feb 2008 03:25:20 -0000	1.39
@@ -1 +1 @@
-a3a31fc0e5b791ef330dd0627095d90f  kdegraphics-3.5.8.tar.bz2
+3d75e27180573a4e077e0245055891a5  kdegraphics-3.5.9.tar.bz2


--- post-3.5.8-kdegraphics-kpdf.diff DELETED ---