rpms/xscreensaver/devel xscreensaver.spec,1.39,1.40

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Log Message:
* Tue Aug 14 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.02-3
- Remove man6x from file entry, now included in filesystem



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xscreensaver.spec	4 May 2007 07:15:42 -0000	1.39
+++ xscreensaver.spec	14 Aug 2007 08:14:03 -0000	1.40
@@ -2,9 +2,9 @@
 
 %define version       5.02
 %define beta_ver      %{nil}
-%define fedora_rel    1
+%define fedora_rel    3
 
-%define extrarel      .1
+%define extrarel      %{nil}
 
 %if 0%{?fedora} >= 7
 %define default_text  %{_datadir}/doc/HTML/README-Accessibility
@@ -281,13 +281,20 @@
 desktop-file-install --vendor gnome --delete-original    \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
    --add-only-show-in GNOME                              \
+%if 0%{?fedora} <= 7
    --add-category X-Red-Hat-Base                         \
+%else
+   --remove-category Appearance                          \
+   --remove-category AdvancedSettings                    \
+   --remove-category Application                         \
+   --add-category    DesktopSettings                     \
+%endif
    $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # This function prints a list of things that get installed.
 # It does this by parsing the output of a dummy run of "make install".
 list_files() {
-   echo "%%defattr(-,root,root)"
+   echo "%%defattr(-,root,root,-)"
    make -s install_prefix=${RPM_BUILD_ROOT} INSTALL=true "$@"  \
       | sed -e 's|directory* \([^ ][^ ]*\)$|/%%dir\1|'         \
       | sed -n -e 's at .* \(/[^ ]*\)$@\1 at p'                      \
@@ -326,6 +333,7 @@
    %{_datadir}/pixmaps \
    %{_datadir}/X11/app-defaults \
    %{_mandir}/man[1-9] \
+   %{_mandir}/man[1-9]x \
    ; do
    :
    ff=`echo $f | sed -e 's|\/|\\\\\\\\\/|g'`
@@ -382,7 +390,7 @@
    glist=gnome-$list
    rm -f $glist
 
-   echo "%%defattr(-,root,root)" > $glist
+   echo "%%defattr(-,root,root,-)" > $glist
    echo "%%dir $SAVERDIR" >> $glist
 
    set +x
@@ -406,24 +414,30 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 
 %files -f base.files base
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 
 %files -f extras.files extras
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 
 %files -f gl-extras.files gl-extras
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 
 %files -f gnome-extras.files extras-gss
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 
 %files -f gnome-gl-extras.files gl-extras-gss
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 
 %changelog
+* Tue Aug 14 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.02-3
+- Remove man6x from file entry, now included in filesystem
+
+* Sun Aug 12 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.02-2
+- Fix up desktop categories
+
 * Sat Apr 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.02-1
 - Update to 5.02