rpms/kdelibs3/devel kdelibs3.spec,1.71,1.72

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2900

Modified Files:
	kdelibs3.spec 
Log Message:
rhel cleanup



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- kdelibs3.spec	23 Sep 2009 19:39:16 -0000	1.71
+++ kdelibs3.spec	28 Sep 2009 11:25:10 -0000	1.72
@@ -4,23 +4,20 @@
 
 %define distname "Fedora"
 
+%if 0%{?rhel}
+%define distname "EL"
+%endif
+
 %define kde_settings 1 
 
-%define arts 1
 %define arts_ev 8:1.5.10
 %define qt3 qt3
 %define qt3_version 3.3.8b
 %define qt3_ev %{?qt3_epoch}%{qt3_version} 
-# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
-#global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
-%define qt3_ver %{qt3_version}
-# fix this?... -- Rex
-%define qt3_docdir %{_docdir}/qt-devel-%{qt3_ver}
+%define qt3_docdir %{_docdir}/qt-devel-%{qt3_version}
 
 %define kde_major_version 3
 
-%define make_cvs 1
-
 %define apidocs 1
 
 # We always include this here now because kdeartwork 4 has moved on to
@@ -30,7 +27,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 17%{?dist}
+Release: 18%{?dist}
 
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
@@ -99,8 +96,6 @@ Patch204: kdelibs-3.5.10-cve-2009-1698.p
 # fix CVE-2009-2702 - ssl incorrect verification of SSL certificate with NUL in subjectAltName
 Patch205: kdelibs-3.5.10-CVE-2009-2702.patch
 
-#{?arts:Requires: arts >= %{arts_ev}}
-#Requires: %{qt3} >= %{qt3_ev}
 Requires: hicolor-icon-theme
 %if %{kde_settings}
 Requires: kde-settings >= 3.5
@@ -112,9 +107,9 @@ Requires: shadow-utils
 BuildRequires: sudo
 Requires(hint): sudo
 
-%define   libkdnssd libkdnssd
-# omit for now, may contribute to http://bugzilla.redhat.com/441222 
-#Requires: %{libkdnssd}
+%if 0%{?fedora}
+%define libkdnssd libkdnssd
+%endif
 %define BuildRequires: xorg-x11-proto-devel libX11-devel
 %define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
 Requires: iceauth
@@ -122,12 +117,13 @@ Requires: iceauth
 Requires(pre): coreutils
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires: hunspell
 
 BuildRequires: gettext
 BuildRequires: pcre-devel
 BuildRequires: cups-devel cups
 BuildRequires: %{qt3}-devel %{qt3}-devel-docs
-%{?arts:BuildRequires: arts-devel >= %{arts_ev}}
+BuildRequires: arts-devel >= %{arts_ev}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
 BuildRequires: libxslt-devel
@@ -150,21 +146,17 @@ BuildRequires: bzip2-devel
 BuildRequires: libtiff-devel
 BuildRequires: libacl-devel libattr-devel
 BuildRequires: enchant-devel
-Requires: hunspell
 BuildRequires: krb5-devel
 BuildRequires: openldap-devel
 BuildRequires: db4-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: pkgconfig
 BuildRequires: glibc-kernheaders
-%define _with_libutempter 1
 BuildRequires: libutempter-devel
 BuildRequires: findutils
 BuildRequires: jasper-devel
 BuildRequires: OpenEXR-devel
-%if %{make_cvs}
 BuildRequires: automake libtool
-%endif
 
 %if "%{name}" != "kdelibs" && "%{?apidocs}" != "1"
 Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
@@ -194,7 +186,7 @@ Provides:  kdelibs-devel = 6:%{version}-
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{qt3}-devel
 Requires: openssl-devel
-%{?arts:Requires: arts-devel}
+Requires: arts-devel
 %{?libkdnssd:Requires: libkdnssd-devel}
 %description devel
 This package includes the header files you will need to compile
@@ -229,7 +221,7 @@ format for easy browsing
 %patch38 -p1 -b .cupsdconf2-group
 %patch39 -p1 -b .kabc-make
 %patch40 -p1 -b .kdeprint-utf8
-%{?_with_libutempter:%patch41 -p1 -b .utempter}
+%patch41 -p1 -b .utempter
 %patch43 -p1 -b .lang
 %patch45 -p1 -b .xdg-autostart
 %patch46 -p1 -b .kate-vhdl
@@ -257,11 +249,9 @@ format for easy browsing
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
-%if %{make_cvs}
 # hack/fix for newer automake
-  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-  make -f admin/Makefile.common cvs
-%endif
+sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
+make -f admin/Makefile.common cvs
 
 
 %build
@@ -302,7 +292,6 @@ export DO_NOT_COMPILE="libkscreensaver"
    --enable-dnotify \
    --enable-inotify \
    --with-utempter \
-   %{!?arts:--without-arts} \
    %{?_with_rgbfile} \
    --with-jasper \
    --with-openexr \
@@ -580,6 +569,9 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
+* Mon Sep 28 2009 Than Ngo <than at redhat.com> - 3.5.10-18
+- rhel cleanup
+
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-17 
 - move /etc/profile.d/kde.(sh|csh) to kde-settings (F-12+)