rpms/xscreensaver/devel xscreensaver.spec,1.85,1.86

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8666

Modified Files:
	xscreensaver.spec 
Log Message:
orz..


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- xscreensaver.spec	2 Feb 2009 12:12:48 -0000	1.85
+++ xscreensaver.spec	2 Feb 2009 12:58:26 -0000	1.86
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    6
+%define fedora_rel    7
 
 %define extrarel      %{nil}
 
@@ -301,11 +301,6 @@
 sed -i.icon -e 's|xscreensaver\.xpm|xscreensaver|' \
    driver/screensaver-properties.desktop.in
 %endif
-# Kill OnlyShowIn=GNOME; on F-11+ (bug 483495)
-%if 0%{?fedora} >= 11
-sed -i.xfce -e '/OnlyShowIn/d' \
-   driver/screensaver-properties.desktop.in
-%endif
 
 # Disable (don't build) some tests
 # apm: doesn't compile
@@ -395,9 +390,12 @@
 
 make install_prefix=$RPM_BUILD_ROOT INSTALL="install -c -p" install
 
+# Kill OnlyShowIn=GNOME; on F-11+ (bug 483495)
 desktop-file-install --vendor "" --delete-original    \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
+%if 0%{?fedora} < 11
    --add-only-show-in GNOME                              \
+%endif
    --add-category    DesktopSettings                     \
 %if 0
    --add-category X-Red-Hat-Base                         \
@@ -646,7 +644,7 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Mon Feb  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-6
+* Mon Feb  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-7
 - Remove OnlyShowIn=GNOME on F-11+ (to make happy with XFCE):
   bug 483495
 - Add more comments about bug reference