rpms/xscreensaver/devel xscreensaver-5.04-gcc43.patch, NONE, 1.1 xscreensaver.spec, 1.63, 1.64

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8329

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.04-gcc43.patch 
Log Message:
* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.04-4
- Add patch to xscreensaver be happy with gcc43
- Rebuild against gcc43


xscreensaver-5.04-gcc43.patch:

--- NEW FILE xscreensaver-5.04-gcc43.patch ---
--- xscreensaver-5.04/driver/demo-Gtk.c.gcc43	2007-04-10 10:56:40.000000000 +0900
+++ xscreensaver-5.04/driver/demo-Gtk.c	2008-02-09 20:18:11.000000000 +0900
@@ -1127,7 +1127,7 @@
   if (!was) gtk_widget_set_sensitive (parent, True);
 #ifdef HAVE_GTK2
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));
-  STFU g_assert (model);
+  g_assert (model);
   if (gtk_tree_model_iter_nth_child (model, &iter, NULL, list_elt))
     {
       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list));


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- xscreensaver.spec	9 Feb 2008 04:33:47 -0000	1.63
+++ xscreensaver.spec	9 Feb 2008 14:12:30 -0000	1.64
@@ -2,13 +2,10 @@
 
 %define version       5.04
 %define beta_ver      %{nil}
-%if 0%{?fedora} <= 6
-%define modular_conf  0
-%define fedora_rel    1
-%else
+
+
 %define modular_conf  1
-%define fedora_rel    3
-%endif
+%define fedora_rel    4
 
 %define extrarel      %{nil}
 
@@ -28,7 +25,7 @@
 Summary:         X screen saver and locker
 Name:            %{name}
 Version:         %{version}
-Release:         %{fedora_rel}%{?dist}%{?extrarel}.2
+Release:         %{fedora_rel}%{?dist}%{?extrarel}
 Epoch:           1
 License:         BSD
 Group:           Amusements/Graphics
@@ -38,6 +35,7 @@
 Source10:        update-xscreensaver-hacks
 %endif
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
+Patch2:          xscreensaver-5.04-gcc43.patch
 Patch21:         xscreensaver-5.04-webcollage-default-nonet.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -184,6 +182,7 @@
 %setup -q -n %{name}-%{version}%{?beta_ver}
 
 %patch1 -p1 -b .sanitize-hacks
+%patch2 -p1 -b .gcc43
 %patch21 -p1 -b .nonet
 
 change_option(){
@@ -572,7 +571,8 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.04-4
+- Add patch to xscreensaver be happy with gcc43
 - Rebuild against gcc43
 
 * Fri Dec  7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.04-3