rpms/kdelibs/devel kdelibs.spec,1.225,1.226

Mon Aug 6 09:47:07 UTC 2007

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16369

Modified Files:
	kdelibs.spec 
Log Message:
cleanup



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226

--- kdelibs.spec	3 Aug 2007 15:02:21 -0000	1.225
+++ kdelibs.spec	6 Aug 2007 09:46:35 -0000	1.226
@@ -1,10 +1,7 @@
-
 # kdelibs3 review: http://bugzilla.redhat.com/248899
 
 %define distname "Fedora"
 
-#define debug 1 
-%define final 1
 %define kde_settings 1 
 
 %define arts 1
@@ -24,18 +21,17 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.7
-Release: 16%{?dist}.1
+Release: 17%{?dist}
 
-#if 0%{?fedora} > 7
-%if 0
-Name:      kdelibs3
+if 0%{?fedora} > 8
+Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
-Provides:  kdelibs = 6:%{version}-%{release}
+Provides: kdelibs = 6:%{version}-%{release}
 %else
-Name:      kdelibs
-Epoch:     6
+Name: kdelibs
+Epoch: 6
 Obsoletes: kdelibs3 = %{version}-%{release}
-Provides:  kdelibs3 = %{version}-%{release}
+Provides: kdelibs3 = %{version}-%{release}
 %endif
 
 # FIXME/TODO: there appear to be bits of ARTISTIC, BSD, GPLv2, GFDLv2(?), QPL too -- Rex
@@ -67,19 +63,16 @@
 Patch44: kdelibs-3.5.7-cups13.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
-Patch104: kdelibs-3.5.5-kstandarddirs.patch
+Patch100: kdelibs-3.5.5-kstandarddirs.patch
+# http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
+Patch101: kde-3.5-libtool-shlibext.patch
+# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
+Patch102: kdelibs-3.5.6-137675.patch
+# kget ignores simultaneous download limit (kde #101956)
+Patch103: kdelibs-3.5.0-101956.patch
 
 # upstream patches
-# kget ignores simultaneous download limit (kde #101956)
-Patch502: kdelibs-3.5.0-101956.patch
-# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
-Patch503: kdelibs-3.5.6-137675.patch
-Patch505: kdelibs-3.5.7-kde#146105.patch
-# http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
-Patch93359: kde-3.5-libtool-shlibext.patch
-## See http://bugs.kde.org/139445, patch needs boost-devel, FIXME, doesn't apply to kde-3.5.7
-Patch139445: kdelibs-3.5.5-lib_loader-1.2.patch
-#BuildRequires: boost-devel
+Patch500: kdelibs-3.5.7-kde#146105.patch
 
 %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -90,7 +83,6 @@
 Requires: kde-filesystem
 Requires: redhat-menus
 Requires: shadow-utils
-# kdesu/sudo support, http://bugs.kde.org/20914
 BuildRequires: sudo
 Requires(hint): sudo
 
@@ -140,7 +132,6 @@
 BuildRequires: pkgconfig
 BuildRequires: glibc-kernheaders
 %if 0%{?fedora} > 5 || 0%{?rhel} > 4
-# See also http://bugzilla.redhat.com/205767
 %define _with_libutempter 1
 BuildRequires: libutempter-devel
 %else
@@ -180,17 +171,6 @@
 %{?arts:Requires: arts-devel}
 %{?libkdnssd:Requires: libkdnssd-devel}
 Requires: openssl-devel
-## those below can/should be omitted from future builds -- Rex
-#Requires: libart_lgpl-devel
-#Requires: libxslt-devel
-#Requires: libjpeg-devel
-#Requires: zlib-devel
-#Requires: bzip2-devel
-#Requires: libtiff-devel
-#Requires: libidn-devel
-#Requires: libacl-devel
-#Requires: pcre-devel
-#{?_with_libutempter:Requires: libutempter-devel}
 %description devel
 This package includes the header files you will need to compile
 applications for KDE.
@@ -205,8 +185,7 @@
 Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
 Provides:  kdelibs-apidocs = 6:%{version}-%{release}
 %endif
-## old, never published outside of rawhide, afaik -- Rex
-#Obsoletes: kdelibs-docs < 6:%{version}-%{release}
+
 %description apidocs
 This package includes the KDE API documentation in HTML
 format for easy browsing
@@ -216,9 +195,7 @@
 %setup -q -n kdelibs-%{version}
 
 %patch1 -p1 -b .xdg-menu
-%if "%{?debug}" != "1"
 %patch2 -p1 -b .debug
-%endif
 %patch4 -p1 -b .ksyscoca
 %patch5 -p1 -b .openssl
 %patch15 -p1 -b .buildroot
@@ -231,17 +208,15 @@
 %patch39 -p1 -b .kabc-make
 %patch40 -p1 -b .kdeprint-utf8
 %{?_with_libutempter:%patch41 -p1 -b .utempter}
-# omission recommended by upstream: http://bugs.kde.org/147454#c37
 %patch43 -p1 -b .lang
 %patch44 -p1 -b .cups13
 
-%patch104 -p1 -b .kstandarddirs
+%patch100 -p1 -b .kstandarddirs
+%patch101 -p1 -b .libtool-shlibext
+%patch102 -p0 -b .kde#137675
 
 # upstream patches
-%patch503 -p0 -b .kde#137675
-%patch505 -p0 -b .kde#146105
-%patch93359 -p1 -b .libtool-shlibext
-#patch139445 -p1 -b .kde#139445
+%patch500 -p0 -b .kde#146105
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -254,8 +229,6 @@
 unset QTDIR && . /etc/profile.d/qt.sh
 
 export QTDOC=%{qtdocdir}
-# use patch93359 instead
-#export libltdl_cv_shlibext=".so"
 
 if [ -x /etc/profile.d/krb5.sh ]; then
   . /etc/profile.d/krb5.sh
@@ -293,9 +266,8 @@
 
 make %{?_smp_mflags}
 
-# FIXME/TODO: build as noarch?  -- Rex
 %if "%{?apidocs}" == "1"
-make %{?_smp_mflags} apidox
+  make %{?_smp_mflags} apidox
 %endif
 
 
@@ -329,16 +301,11 @@
 %else
 install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
 install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
+# menus
 
-## menus
 mkdir -p %{buildroot}%{_sysconfdir}/kde/xdg/menus
 mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu
-# compat-symlinks, can go away eventually -- Rex
-ln -s %{_sysconfdir}/xdg/menus/kde-applications.menu \
-      %{buildroot}%{_sysconfdir}/kde/xdg/menus/kde-applications.menu
-ln -s kde-applications.menu \
-      %{buildroot}%{_sysconfdir}/kde/xdg/menus/applications.menu
 %endif
 
 echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
@@ -349,7 +316,7 @@
 # ghost'd files
 touch $RPM_BUILD_ROOT%{_datadir}/services/ksycoca
 
-## remove references to extraneous/optional libraries in .la files (#170602)
+# remove references to extraneous/optional libraries in .la files (#170602)
 # fam, libart_lgpl, pcre, libidn, libpng, libjpeg, libdns_sd, libacl/libattr, alsa-lib/asound
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
  sed -i \
@@ -374,10 +341,10 @@
  -e "s at -lasound@@g"  \
  -e "s at -lutempter@@g"
 
-## unpackaged files
 # libkdnssd bits
 rm -f %{buildroot}%{_libdir}/libkdnssd.la
 %{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
+
 %if "%{name}" != "kdelibs"
 # remove conflicts with kdelibs-4
 pushd %{buildroot}%{_bindir}
@@ -389,10 +356,18 @@
 # devel stuff (skip for now)
 #rm -f checkXML kconfig_compiler ksvgtopng kunittestmodrunner makekdewidgets
 popd
-rm -f  %{buildroot}%{_datadir}/config/* %{buildroot}%{_datadir}/config/ui/kprintpreviewui.rc || :
-rm -rf %{buildroot}%{_datadir}/config/colors %{buildroot}%{_datadir}/apps/k* %{buildroot}%{_datadir}/apps/LICENSES \
-       %{buildroot}%{_datadir}/apps/proxyscout %{buildroot}%{_datadir}/locale \
-       %{buildroot}%{_datadir}/autostart %{buildroot}/etc/xdg %{buildroot}%{_docdir}/HTML %{buildroot}%{_datadir}/emoticons
+rm -f  %{buildroot}%{_datadir}/config/* \
+       %{buildroot}%{_datadir}/config/ui/kprintpreviewui.rc || :
+
+rm -rf %{buildroot}%{_datadir}/config/colors \
+       %{buildroot}%{_datadir}/apps/k* \
+       %{buildroot}%{_datadir}/apps/LICENSES \
+       %{buildroot}%{_datadir}/apps/proxyscout \
+       %{buildroot}%{_datadir}/locale \
+       %{buildroot}%{_datadir}/autostart \
+       %{buildroot}/etc/xdg \
+       %{buildroot}%{_docdir}/HTML \
+       %{buildroot}%{_datadir}/emoticons
 %endif
 
 
@@ -524,6 +499,9 @@
 
 
 %changelog
+* Mon Aug 06 2007 Than Ngo <than at redhat.com> - 6:3.5.7-17
+- cleanup
+
 * Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-16
 - undo kdelibs3 rename (for now, anyway)
 - move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,


