rpms/kdenetwork/devel .cvsignore, 1.35, 1.36 kdenetwork.spec, 1.68, 1.69 sources, 1.39, 1.40 kdenetwork-3.4.92-gcc4.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: than

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

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	kdenetwork-3.4.92-gcc4.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	30 Nov 2005 15:39:03 -0000	1.35
+++ .cvsignore	5 Feb 2006 19:29:54 -0000	1.36
@@ -8,3 +8,4 @@
 kdenetwork-3.4.91.tar.bz2
 kdenetwork-3.4.92.tar.bz2
 kdenetwork-3.5.0.tar.bz2
+kdenetwork-3.5.1.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kdenetwork.spec	9 Dec 2005 22:41:10 -0000	1.68
+++ kdenetwork.spec	5 Feb 2006 19:29:54 -0000	1.69
@@ -5,13 +5,16 @@
 %define make_cvs 1
 %define xmms 0
 
-%define qt_version 1:3.3.5
+%define qt_version 3.3.5
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
+%define qt_epoch 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdenetwork
-Version: 3.5.0
-Release: 1.1
+Version: 3.5.1
+Release: 1
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -30,11 +33,12 @@
 Patch2: kde-libtool.patch
 Patch3: kdenetwork-3.3.92-kppp.patch
 Patch4: kdenetwork-3.2.3-resolv.patch
-Patch8: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
+Patch5: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
-Prereq: /sbin/chkconfig
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): /sbin/chkconfig
 
 BuildRequires: qt-devel >= %{qt_version}
 BuildRequires: kdebase-devel
@@ -49,7 +53,6 @@
 %else
 Obsoletes: kdenetwork-nowlistening
 %endif
-Requires(post,postun): /sbin/ldconfig
 
 %description
 Networking applications for the K Desktop Environment.
@@ -81,7 +84,7 @@
 %patch2 -p1 -b .libtool
 %patch3 -p1 -b .kppp
 %patch4 -p1 -b .ppp
-%patch8 -p1 -b .libgadu-va_copy
+%patch5 -p1 -b .libgadu-va_copy
 
 find -name CVS | xargs rm -rf 
 
@@ -89,13 +92,6 @@
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
 %endif
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -103,17 +99,26 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DNDEBUG -DNO_DEBUG"
+FLAGS="$RPM_OPT_FLAGS"
 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 \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --enable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -232,6 +237,9 @@
 %endif
 
 %changelog
+* Sun Feb 05 2006 Than Ngo <than at redhat.com> 7:3.5.1-1 
+- 3.5.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	30 Nov 2005 15:39:03 -0000	1.39
+++ sources	5 Feb 2006 19:29:54 -0000	1.40
@@ -1 +1 @@
-c83dce8cc496b6ec8773483df1c85119  kdenetwork-3.5.0.tar.bz2
+02ced8c14c80f28635056488949d56d7  kdenetwork-3.5.1.tar.bz2


--- kdenetwork-3.4.92-gcc4.patch DELETED ---