rpms/kdegames/devel kdegames-3.4.2-setgid.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 kdegames.spec, 1.38, 1.39 sources, 1.29, 1.30 admin-visibility.patch, 1.3, NONE

[fedora-cvs-commits at redhat.com]

Author: than

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

Modified Files:
	.cvsignore kdegames.spec sources 
Added Files:
	kdegames-3.4.2-setgid.patch 
Removed Files:
	admin-visibility.patch 
Log Message:
update to 3.4.2


kdegames-3.4.2-setgid.patch:
 configure.in.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdegames-3.4.2-setgid.patch ---
--- kdegames-3.4.2/libkdegames/configure.in.in.tn	2005-08-02 17:13:47.000000000 +0200
+++ kdegames-3.4.2/libkdegames/configure.in.in	2005-08-02 17:15:52.000000000 +0200
@@ -21,12 +21,12 @@
 
 AC_MSG_CHECKING(whether to setgid binaries)
 AC_ARG_ENABLE(setgid,
-  [  --disable-setgid           Disable the use of setgid binaries],
+  [  --enable-setgid           Enable the use of setgid binaries],
   [case "${enableval}" in
     yes) case "$use_highscore_dir" in yes) setgid=true;; no) setgid=false;; esac ;;
     no)  setgid=false ;;
     *) AC_MSG_ERROR(bad value ${enableval} for --disable-setgid) ;;
-   esac],[setgid=true])
+   esac],[setgid=false])
 AC_SUBST(setgid)
 AC_MSG_RESULT($setgid)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	28 Jun 2005 18:46:10 -0000	1.28
+++ .cvsignore	8 Aug 2005 15:22:30 -0000	1.29
@@ -5,3 +5,5 @@
 kdegames-3.4.0-patched-rc1.tar.bz2
 kdegames-3.4.0-patched.tar.bz2
 kdegames-3.4.1-patched.tar.bz2
+kdegames-3.4.2.tar.bz2
+kdegames-3.4.2-patched.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdegames.spec	28 Jun 2005 18:46:10 -0000	1.38
+++ kdegames.spec	8 Aug 2005 15:22:30 -0000	1.39
@@ -13,7 +13,9 @@
 
 %define qt_version 3.3.4
 
-Version: 3.4.1
+%define disable_gcc_check_and_hidden_visibility 1
+
+Version: 3.4.2
 Release: 1
 Epoch: 6
 Summary: K Desktop Environment - Games
@@ -26,7 +28,9 @@
 
 Patch: kde-libtool.patch
 Patch1: kdegames-3.1.1-konquest.patch
-Patch2: admin-visibility.patch
+
+# upstream patches
+Patch200: kdegames-3.4.2-setgid.patch
 
 Requires: kdelibs >= 6:%{version}
 Requires: kdebase >= 6:%{version}
@@ -68,7 +72,14 @@
 %setup -q -n %{name}-%{version}%{patch_name}
 %patch -p1 -b .libtool
 %patch1 -p1 -b .konquest
-%patch2 -p1 -b .gcc
+%patch200 -p1 -b .setgid
+
+%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
@@ -140,6 +151,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Aug 08 2005 Than Ngo <than at redhat.com> 6:3.4.2-1
+- update to 3.4.2
+
 * Tue Jun 28 2005 Than Ngo <than at redhat.com> 6:3.4.1-1
 - 3.4.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	28 Jun 2005 18:46:10 -0000	1.29
+++ sources	8 Aug 2005 15:22:30 -0000	1.30
@@ -1 +1 @@
-2d48fc3c9d06584c7cfebafad8f2aaa3  kdegames-3.4.1-patched.tar.bz2
+62d87ba6a9c0160cf84d464ae2598b57  kdegames-3.4.2-patched.tar.bz2


--- admin-visibility.patch DELETED ---