[diveintopython] remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
Rahul Sundaram
sundaram at fedoraproject.org
Sat Feb 23 04:32:06 UTC 2013
commit 7c1e0dfc99b29c47e132dfd93356383472236e87
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date: Fri Feb 22 23:31:55 2013 -0500
remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
- clean up spec to follow current guidelines
- fix desktop file to follow specification
diveintopython.desktop.in | 1 -
diveintopython.spec | 23 ++++++++---------------
2 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/diveintopython.desktop.in b/diveintopython.desktop.in
index 4ac4d5c..6e60ee4 100644
--- a/diveintopython.desktop.in
+++ b/diveintopython.desktop.in
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Dive Into Python
Comment=Open Dive Into Python book
Exec=xdg-open @DOCDIR@/pdf/diveintopython.pdf
diff --git a/diveintopython.spec b/diveintopython.spec
index c00753a..ef21d4f 100644
--- a/diveintopython.spec
+++ b/diveintopython.spec
@@ -1,6 +1,6 @@
Name: diveintopython
Version: 5.4
-Release: 23%{?dist}
+Release: 24%{?dist}
Summary: Dive into Python - a python book
@@ -11,7 +11,6 @@ Source0: http://www.diveintopython.net/download/%{name}-common-%{version}
Source1: http://www.diveintopython.net/download/%{name}-xml-%{version}.zip
Source2: %{name}.desktop.in
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: diveintopython-pdf, xdg-utils
Patch0: diveintopython-build.xml.patch
@@ -69,7 +68,6 @@ ant -Dxalan=1
popd
%install
-rm -rf $RPM_BUILD_ROOT
pushd build/dist
#cleanup unnecessary duplicates
rm -rf pdf/*.png pdf/*.html pdf/images/
@@ -86,41 +84,36 @@ popd
mkdir ${RPM_BUILD_ROOT}%{_datadir}/applications/
cat %{SOURCE2}|sed "s|@DOCDIR@|%{_docdir}/%{name}-%{version}/|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/diveintopython.desktop
-desktop-file-install --vendor="fedora" \
- --delete-original \
+desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category="Documentation" \
${RPM_BUILD_ROOT}%{_datadir}/applications/diveintopython.desktop
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%files html
-%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/html
%files pdf
-%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/pdf
-%{_datadir}/applications/fedora-diveintopython.desktop
+%{_datadir}/applications/diveintopython.desktop
%files single-html
-%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/htmlflat
%files txt
-%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/txt
-
%changelog
+* Fri Feb 22 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 5.4-24
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+- fix desktop file to follow specification
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list