SPECS: kdelibs.spec - Updated branch.diff (khtml fixes) - Updated ...

[adgor]

Author: adgor                        Date: Sat Sep 30 12:51:34 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Updated branch.diff (khtml fixes)
- Updated kstandarddirs.patch (removed Ra compatibilities)
- Removed finally defaultfonts.patch
- Cleanups
- Release 9

---- Files affected:
SPECS:
   kdelibs.spec (1.471 -> 1.472) 

---- Diffs:

================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.471 SPECS/kdelibs.spec:1.472
--- SPECS/kdelibs.spec:1.471	Fri Sep 29 14:31:10 2006
+++ SPECS/kdelibs.spec	Sat Sep 30 14:51:28 2006
@@ -22,7 +22,7 @@
 Summary(uk):	K Desktop Environment - âŚÂĚŚĎÔĹËÉ
 Name:		kdelibs
 Version:	3.5.4
-Release:	8
+Release:	9
 Epoch:		9
 License:	LGPL
 Group:		X11/Libraries
@@ -36,7 +36,6 @@
 Patch100:	%{name}-branch.diff
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-kstandarddirs.patch
-Patch2:		%{name}-defaultfonts.patch
 Patch3:		%{name}-use_system_sgml.patch
 Patch4:		%{name}-fileshareset.patch
 Patch5:		%{name}-appicon_themable.patch
@@ -341,7 +340,6 @@
 %patch100 -p0
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -357,7 +355,6 @@
 export kde_libs_htmldir=%{_kdedocdir}
 %{__make} -f admin/Makefile.common cvs
 
-CPPFLAGS="-I$(pwd)/kdecore/network"
 %configure \
 	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
 	%{!?debug:--disable-rpath} \
@@ -367,11 +364,11 @@
 	--enable-libsuffix=64 \
 %endif
 	--enable-mitshm \
-	--with-ldap=no \
 	--with%{!?with_alsa:out}-alsa \
-	--with-qt-libraries=%{_libdir} \
+	--with-distribution="PLD Linux Distribution" \
+	--with-ldap=no \
 	--with-lua-includes=%{_includedir}/lua50 \
-	--with-distribution="PLD Linux Distribution"
+	--with-qt-libraries=%{_libdir}
 
 %{__make}
 %{?with_apidocs:%{__make} apidox}
@@ -400,20 +397,6 @@
 	$RPM_BUILD_ROOT%{_datadir}/services/kconfiguredialog \
 	$RPM_BUILD_ROOT%{_iconsdir}/crystalsvg/{16x16,22x22,32x32,48x48,64x64,128x128}/apps
 
-# Debian manpages
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-#cd debian/man
-#%{__perl} -pi -e 's/ksendbugemail/ksendbugmail/;s/KSENDBUGEMAIL/KSENDBUGMAIL/' \
-#	ksendbugmail.sgml
-#
-#for f in *.sgml ; do
-#	base="$(basename $f .sgml)"
-#	upper="$(echo ${base} | tr a-z A-Z)"
-#	db2man $f
-#	install ${upper}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${base}.1
-#done
-#cd -
-
 # For fileshare
 touch $RPM_BUILD_ROOT/etc/security/fileshare.conf
 %{__sed} -i -e "s|/etc/init.d|/etc/rc.d/init.d|g" $RPM_BUILD_ROOT%{_bindir}/fileshare*
@@ -1010,6 +993,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.472  2006/09/30 12:51:28  adgor
+- Updated branch.diff (khtml fixes)
+- Updated kstandarddirs.patch (removed Ra compatibilities)
+- Removed finally defaultfonts.patch
+- Cleanups
+- Release 9
+
 Revision 1.471  2006/09/29 12:31:10  adgor
 - Updated branch.diff, rel. 8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdelibs.spec?r1=1.471&r2=1.472&f=u