rpms/kdegames/devel .cvsignore, 1.32, 1.33 kdegames.spec, 1.45, 1.46 sources, 1.33, 1.34

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdegames/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2171

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
- 3.5.1




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	5 Dec 2005 13:08:51 -0000	1.32
+++ .cvsignore	3 Feb 2006 21:52:02 -0000	1.33
@@ -10,3 +10,4 @@
 kdegames-3.4.91-patched.tar.bz2
 kdegames-3.4.92-patched.tar.bz2
 kdegames-3.5.0-patched.tar.bz2
+kdegames-3.5.1-patched.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdegames.spec	9 Dec 2005 22:41:09 -0000	1.45
+++ kdegames.spec	3 Feb 2006 21:52:02 -0000	1.46
@@ -3,20 +3,23 @@
 %define make_cvs 1
 
 %define arts 1
-%define ksok 0
+%define redhatify 1
 
-%if %{ksok}
-%define patch_name %{nil}
-%else
+%if %{redhatify}
 %define patch_name -patched
+%else
+%define patch_name %{nil}
 %endif
 
 %define qt_version 3.3.5
+%define qt_epoch 1
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
-Release: 1.1
+Version: 3.5.1
+Release: 1
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
@@ -30,10 +33,9 @@
 Patch: kde-libtool.patch
 Patch1: kdegames-3.1.1-konquest.patch
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
-
-Prereq: /sbin/ldconfig
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires(post,postun): /sbin/ldconfig
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -46,6 +48,7 @@
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: libstdc++-devel
+BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
 BuildRequires: perl
 
 %description
@@ -58,7 +61,7 @@
 Summary: Development files for kdegames
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: kdebase-devel >= 6:%{version}
+Requires: kdebase-devel >= %{kdebase_epoch}:%{version}
 
 %description devel
 Development files for the KDE gaming libraries.
@@ -70,13 +73,6 @@
 %patch -p1 -b .libtool
 %patch1 -p1 -b .konquest
 
-%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
@@ -91,16 +87,25 @@
 CFLAGS="$FLAGS" \
 CXXFLAGS="$FLAGS -fno-check-new" \
 %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
-%%ifarch s390 s390x
+%ifarch s390 s390x
    --disable-pie \
 %endif
 %if %{final}
    --enable-final \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
    --includedir=%{prefix}/include/kde \
    --with-qt-libraries=$QTDIR/lib
 
@@ -111,8 +116,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-make -C klickety install DESTDIR=$RPM_BUILD_ROOT
-  
 # Make symlinks relative
 pushd $RPM_BUILD_ROOT/usr/share/doc/HTML/en
 for i in *; do
@@ -150,6 +153,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 6: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/kdegames/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Dec 2005 13:08:51 -0000	1.33
+++ sources	3 Feb 2006 21:52:02 -0000	1.34
@@ -1 +1 @@
-cba7f49b36b74954c6bc3226d3912201  kdegames-3.5.0-patched.tar.bz2
+fb44a24d646801989a4e7e837e628c00  kdegames-3.5.1-patched.tar.bz2