[xaos] Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
paragn
paragn at fedoraproject.org
Sun Feb 10 04:55:06 UTC 2013
commit e15af2d6d270f7417ab49ff1201bafe5dfba6d78
Author: Parag Nemade <paragn at fedoraproject.org>
Date: Sun Feb 10 10:26:54 2013 +0530
Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
- Cleanup spec as per recently changed packaging guidelines
xaos.spec | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/xaos.spec b/xaos.spec
index 577cecf..691ae64 100644
--- a/xaos.spec
+++ b/xaos.spec
@@ -1,6 +1,6 @@
Name: xaos
Version: 3.5
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A fast, portable real-time interactive fractal zoomer
Group: Applications/Multimedia
@@ -9,7 +9,6 @@ URL: http://xaos.sourceforge.net
Source0: http://surfnet.dl.sourceforge.net/sourceforge/xaos/xaos-%{version}.tar.gz
Source1: xaos.png
Patch0: xaos-3.5-fix-conflicting-register-types.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: slang-devel
BuildRequires: zlib-devel
BuildRequires: libpng-devel
@@ -63,9 +62,8 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_infodir}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
pushd doc
make xaos.dvi
dvipdfm xaos.dvi
@@ -75,7 +73,7 @@ make html
popd
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
cat > xaos.desktop <<EOF
[Desktop Entry]
@@ -92,7 +90,6 @@ EOF
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install \
- --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
xaos.desktop
@@ -105,10 +102,6 @@ find $RPM_BUILD_ROOT%{_prefix} -exec chmod u+rw '{}' ';'
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
/sbin/install-info %{_infodir}/xaos.info %{_infodir}/dir 2>/dev/null || :
@@ -120,7 +113,6 @@ fi
%files -f %{name}.lang
-%defattr(-,root,root,-)
%doc README COPYING TODO ChangeLog NEWS
%doc AUTHORS doc/xaos.pdf
%doc --parents help/*.html help/*.jpg
@@ -133,6 +125,10 @@ fi
%changelog
+* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 3.5-7
+- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
+- Cleanup spec as per recently changed packaging guidelines
+
* Wed Aug 1 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 3.5-6
- Fix gcc build error wrt conflicting types for register attribute
More information about the scm-commits
mailing list