rpms/xscreensaver/devel xscreensaver.spec,1.64,1.65

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Log Message:
* Sun Feb 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.04-5
- Add -Wno-overlength-strings to shut up string length warning



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- xscreensaver.spec	9 Feb 2008 14:12:30 -0000	1.64
+++ xscreensaver.spec	10 Feb 2008 11:56:01 -0000	1.65
@@ -5,15 +5,11 @@
 
 
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    5
 
 %define extrarel      %{nil}
 
-%if 0%{?fedora} >= 7
 %define default_text  %{_datadir}/doc/HTML/README-Accessibility
-%else
-%define default_text  %{_datadir}/doc/eula.en_US
-%endif
 
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
@@ -65,16 +61,10 @@
 BuildRequires:   gtk2-devel	
 BuildRequires:   libjpeg-devel
 BuildRequires:   libglade2-devel
-%if 0%{?fedora} >= 7
 BuildRequires:   fedora-release-notes
-%else
-BuildRequires:   fedora-release
-%endif
 Requires:        %{_sysconfdir}/pam.d/system-auth
 Requires:        pam > %{pam_ver}
-%if 0%{?fedora} >= 7
 Requires:        xdg-utils
-%endif
 Requires:        xorg-x11-resutils
 Requires:        xorg-x11-fonts-ISO8859-1-100dpi
 
@@ -296,17 +286,16 @@
 cd $archdir
 
 export CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}"
+%if 0%{?fedora} >= 9
+export CFLAGS="$CFLAGS -Wno-overlength-strings"
+%endif
 
 CONFIG_OPTS="--prefix=%{_prefix} --with-pam --without-shadow --without-kerberos"
 CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks"
 CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}"
 CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults"
 CONFIG_OPTS="$CONFIG_OPTS --disable-root-passwd"
-%if 0%{?fedora} >= 7
 CONFIG_OPTS="$CONFIG_OPTS --with-browser=xdg-open"
-%else
-CONFIG_OPTS="$CONFIG_OPTS --with-browser=htmlview"
-%endif
 
 # This is flaky:
 # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
@@ -361,7 +350,7 @@
    --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
    --add-only-show-in GNOME                              \
    --add-category    DesktopSettings                     \
-%if 0%{?fedora} <= 7
+%if 0
    --add-category X-Red-Hat-Base                         \
 %else
    --remove-category Appearance                          \
@@ -571,6 +560,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Feb 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.04-5
+- Add -Wno-overlength-strings to shut up string length warning
+
 * 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