rpms/kdewebdev/FC-5 kdewebdev.spec,1.32,1.33 sources,1.14,1.15

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdewebdev/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5618

Modified Files:
	kdewebdev.spec sources 
Log Message:
3.5.4



Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/kdewebdev.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- kdewebdev.spec	14 Jun 2006 09:35:23 -0000	1.32
+++ kdewebdev.spec	14 Aug 2006 14:46:05 -0000	1.33
@@ -2,27 +2,22 @@
 %define final 0
 %define make_cvs 1
 
-%define arts 1
-
-%define qt_version 3.3.5
-%define kde_version 3.5.3
+%define qt_version 3.3.6
+%define kde_version 3.5.4
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
-%define disable_gcc_check_and_hidden_visibility 1
-
-Version: 3.5.3
-Release: 0.2.fc5
+Version: 3.5.4
+Release: 0.1.fc5
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
 Epoch: 6
 Group: Applications/Editors
 License: GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: http://download.sourceforge.net/quanta/css.tar.bz2
 Source2: http://download.sourceforge.net/quanta/html.tar.bz2
 Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
@@ -30,12 +25,18 @@
 
 Patch0: javascript.patch
 
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 Requires: kdelibs >= %{kdelibs_epoch}:%{kde_version}
 
-BuildPrereq: qt-devel >= %{qt_version}
-BuildPrereq: kdesdk-devel >= %{kde_version}
-BuildPrereq: perl
+BuildRequires: qt-devel >= %{qt_version}
+BuildRequires: kdesdk-devel >= %{kde_version}
+BuildRequires: perl
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
 
 Obsoletes: WebMaker
 Obsoletes: quanta
@@ -68,21 +69,11 @@
   make -f admin/Makefile.common cvs
 %endif
 
-%ifarch s390x s390
-export CXXFLAGS="%{optflags} -O0"
-export CFLAGS="%{optflags} -O0"
-%endif
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -124,16 +115,16 @@
 %post
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
@@ -163,6 +154,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.1.fc5
+- 3.5.4
+
 * Wed Jun 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5
 - build -O0 on s390(x) (gcc workaround)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	12 Jun 2006 22:44:57 -0000	1.14
+++ sources	14 Aug 2006 14:46:05 -0000	1.15
@@ -2,4 +2,4 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-0eeaac8992c4b473caefcc32d49b79a2  kdewebdev-3.5.3.tar.bz2
+310a40555c089e88cc5ff7620a89b444  kdewebdev-3.5.4.tar.bz2