rpms/kdenetwork/FC-4 kdenetwork.spec,1.57,1.58 sources,1.36,1.37

Wed Apr 12 09:51:46 UTC 2006

Author: than

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

Modified Files:
	kdenetwork.spec sources 
Log Message:
3.5.2



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-4/kdenetwork.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58

--- kdenetwork.spec	2 Feb 2006 10:31:57 -0000	1.57
+++ kdenetwork.spec	12 Apr 2006 09:51:43 -0000	1.58
@@ -5,12 +5,17 @@
 %define make_cvs 1
 %define xmms 0
 
-%define qt_version 1:3.3.4
+%define qt_version 3.3.4
+%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
+Version: 3.5.2
 Release: 0.1.fc4
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
@@ -31,8 +36,8 @@
 Patch4: kdenetwork-3.2.3-resolv.patch
 Patch8: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
 Prereq: /sbin/chkconfig
 
 BuildRequires: qt-devel >= %{qt_version}
@@ -96,12 +101,6 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DNDEBUG -DNO_DEBUG"
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
-export KDEDIR=%{_prefix}
-export LDFLAGS="$LDFLAGS `krb5-config --libs`"
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -122,55 +121,50 @@
    --with-qt-libraries=$QTDIR/lib \
    --includedir=%{_includedir}/kde
 
-# ld breaks with -fPIC on ppc, workaround
-# it will be removed when this bug is fixed
-%ifarch ppc ppc64
-   perl -pi -e 's,^pic_flag=" -fPIC -DPIC",pic_flag=" -fpic",g' libtool
-%endif
-
 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
@@ -187,7 +181,7 @@
 exit 0
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -234,6 +228,9 @@
 %endif
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 7:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-4/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	2 Feb 2006 10:31:57 -0000	1.36
+++ sources	12 Apr 2006 09:51:44 -0000	1.37
@@ -1 +1 @@
-02ced8c14c80f28635056488949d56d7  kdenetwork-3.5.1.tar.bz2
+dddc6bb65ffb9e46d118781ca0f26da4  kdenetwork-3.5.2.tar.bz2


