rpms/kdenetwork/devel kdenetwork.spec,1.71,1.72 sources,1.40,1.41

Thu Apr 6 12:21:06 UTC 2006

Author: than

Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31777

Modified Files:
	kdenetwork.spec sources 
Log Message:
3.5.2



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72

--- kdenetwork.spec	11 Feb 2006 03:48:04 -0000	1.71
+++ kdenetwork.spec	6 Apr 2006 12:21:01 -0000	1.72
@@ -5,16 +5,18 @@
 %define make_cvs 1
 %define xmms 0
 
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_epoch 1
 
+%define appdir %{_datadir}/applications/kde
+
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdenetwork
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 1
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -99,7 +101,7 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-FLAGS="$RPM_OPT_FLAGS"
+FLAGS="%{optflags}"
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
 export KDEDIR=%{_prefix}
@@ -134,46 +136,47 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-cp %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/kppp
+mkdir -p %{buildroot}/etc/pam.d
+cp %{SOURCE1} %{buildroot}/etc/pam.d/kppp
 
 # Make symlinks relative
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    [ -d $i -a -L $i/common ] && ln -nfs ../common $i
 done
 popd
 
 # Show only in KDE
-for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb ; do
-   if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop
+for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \
+   kwifimanager kget knewsticker ksirc kdict ; do
+   if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
    fi
 done
 
 # Run kppp through consolehelper
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mv $RPM_BUILD_ROOT%{_bindir}/kppp $RPM_BUILD_ROOT%{_sbindir}
-ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/kppp
-mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
-cat >$RPM_BUILD_ROOT/etc/security/console.apps/kppp <<EOF
+mkdir -p %{buildroot}%{_sbindir}
+mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir}
+ln -s consolehelper %{buildroot}%{_bindir}/kppp
+mkdir -p %{buildroot}/etc/security/console.apps
+cat > %{buildroot}/etc/security/console.apps/kppp <<EOF
 USER=root
 PROGRAM=%{_sbindir}/kppp
 SESSION=true
 EOF
 
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
-cp %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
+mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d
+cp %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d
 
 # Add lisa startup script
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/lisarc
-install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/lisa
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
+install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
+install -m 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/rc.d/init.d/lisa
 
 %post
 /sbin/ldconfig
@@ -190,15 +193,15 @@
 exit 0
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%config /etc/security/console.apps/kppp
-%config /etc/pam.d/kppp
-%config %{_sysconfdir}/lisarc
+%config(noreplace) /etc/security/console.apps/kppp
+%config(noreplace) /etc/pam.d/kppp
+%config(noreplace) %{_sysconfdir}/lisarc
 %config %{_sysconfdir}/rc.d/init.d/lisa
-%config %{_sysconfdir}/xinetd.d/ktalk
+%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
 %doc %{_docdir}/HTML/en/*
 %{_libdir}/*.so*
 %{_libdir}/*.la
@@ -237,6 +240,9 @@
 %endif
 
 %changelog
+* Thu Apr 06 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc5
+- update to 3.5.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	5 Feb 2006 19:29:54 -0000	1.40
+++ sources	6 Apr 2006 12:21:02 -0000	1.41
@@ -1 +1 @@
-02ced8c14c80f28635056488949d56d7  kdenetwork-3.5.1.tar.bz2
+dddc6bb65ffb9e46d118781ca0f26da4  kdenetwork-3.5.2.tar.bz2


