fedora-release fedora-release.spec,1.20,1.21

Jeremy Katz (katzj) fedora-extras-commits at redhat.com
Wed Mar 8 21:21:46 UTC 2006


Author: katzj

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26211

Modified Files:
	fedora-release.spec 
Log Message:
more about fedora magic



Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fedora-release.spec	8 Mar 2006 20:45:02 -0000	1.20
+++ fedora-release.spec	8 Mar 2006 21:21:38 -0000	1.21
@@ -20,6 +20,7 @@
 BuildRoot: %{_tmppath}/fedora-release-root
 BuildArchitectures: noarch
 BuildRequires: xmlto
+BuildRequires: desktop-file-utils
 
 %description
 Fedora Core release file
@@ -73,8 +74,8 @@
 # about fedora stuff
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release
 install -m 644 release-notes/about-fedora.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release
-mkdir -p $RPM_BUILD_ROOT%{datadir}/gnome/help/about-fedora
-cp -r release-notes/about/* $RPM_BUILD_ROOT%{datadir}/gnome/help/about-fedora
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications 
+install -m 644 release-notes/about-fedora.desktop $RPM_BUILD_ROOT%{_datadir}/applications/about-fedora.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,10 +94,14 @@
 fi
 
 %post
-[ -x /usr/sbin/scrollkeeper-update ] && /usr/sbin/scrollkeeper-update
+[ -x /usr/bin/scrollkeeper-update ] && /usr/bin/scrollkeeper-update
+[ -x /usr/bin/update-desktop-database ] && /usr/bin/update-desktop-database
+exit 0
 
 %postun
-[ -x /usr/sbin/scrollkeeper-update ] && /usr/sbin/scrollkeeper-update
+[ -x /usr/bin/scrollkeeper-update ] && /usr/bin/scrollkeeper-update
+[ -x /usr/bin/update-desktop-database ] && /usr/bin/update-desktop-database
+exit 0
 
 %files
 %defattr(-,root,root)
@@ -117,4 +122,4 @@
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 %{_datadir}/omf/fedora-release
-%{_datadir}/gnome/help/about-fedora
+%{_datadir}/applications/*.desktop




More information about the fedora-extras-commits mailing list