rpms/kdewebdev/FC-5 kdewebdev.spec,1.29,1.30 sources,1.13,1.14

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Jun 12 22:44:59 UTC 2006


Author: than

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

Modified Files:
	kdewebdev.spec sources 
Log Message:
update to 3.5.3



Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/kdewebdev.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kdewebdev.spec	5 Apr 2006 21:45:12 -0000	1.29
+++ kdewebdev.spec	12 Jun 2006 22:44:56 -0000	1.30
@@ -5,13 +5,13 @@
 %define arts 1
 
 %define qt_version 3.3.5
-%define kde_version 3.5.2
+%define kde_version 3.5.3
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
@@ -29,7 +29,8 @@
 Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
 
 Patch0: javascript.patch
-Prereq: /sbin/ldconfig
+
+Requires(post,postun): /sbin/ldconfig
 Requires: kdelibs >= %{kdelibs_epoch}:%{kde_version}
 
 BuildPrereq: qt-devel >= %{qt_version}
@@ -67,9 +68,6 @@
   make -f admin/Makefile.common cvs
 %endif
 
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -92,24 +90,24 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
 # install docs
 for i in css html javascript ; do
    pushd $i
    ./install.sh <<EOF
-$RPM_BUILD_ROOT%{_datadir}/apps/quanta/doc
+%{buildroot}%{_datadir}/apps/quanta/doc
 EOF
    popd
    rm -rf $i
 done
 
-cp -R php php.docrc $RPM_BUILD_ROOT%{_datadir}/apps/quanta/doc
+cp -R php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc
 
 # fix dangling symlinks
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -118,15 +116,28 @@
 done
 popd
 
-%post -p /sbin/ldconfig
+%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 ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%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 ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog NEWS README
 %doc %{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/*.so.*
@@ -147,6 +158,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Jun 13 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Apr 2006 21:45:12 -0000	1.13
+++ sources	12 Jun 2006 22:44:57 -0000	1.14
@@ -2,4 +2,4 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-ddd2ded8178f7c4d094d73e95075e7fb  kdewebdev-3.5.2.tar.bz2
+0eeaac8992c4b473caefcc32d49b79a2  kdewebdev-3.5.3.tar.bz2




More information about the fedora-cvs-commits mailing list