[xwrits] Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077

paragn paragn at fedoraproject.org
Sun Feb 10 04:04:22 UTC 2013


commit 34568b4ecb79747609614c9fcab5d8feedb0ec14
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Sun Feb 10 09:36:13 2013 +0530

    Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
    
    - Cleanup spec as per recently changed packaging guidelines

 xwrits.spec |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/xwrits.spec b/xwrits.spec
index 752060d..e35ab05 100644
--- a/xwrits.spec
+++ b/xwrits.spec
@@ -2,7 +2,7 @@ Summary: Reminds you take wrist breaks
 
 Name: xwrits
 Version: 2.26
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://www.lcdf.org/xwrits/xwrits-%{version}.tar.gz
 Source2: xwrits.png
 Source3: xwrits.desktop
@@ -16,8 +16,6 @@ BuildRequires: libXt-devel
 BuildRequires: libXext-devel
 BuildRequires: libXinerama-devel
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 %description
 Xwrits reminds you to take wrist breaks, which
 should help you prevent or manage a repetitive
@@ -47,28 +45,27 @@ CFLAGS="${RPM_OPT_FLAGS}" ./configure --prefix=${RPM_BUILD_ROOT}%{_prefix} --lib
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
 make install
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
-cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
-desktop-file-install --vendor fedora                            \
+cp -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
+desktop-file-install                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
         %{SOURCE3}
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
 %files
-%defattr(-,root,root,-)
 %doc NEWS README GESTURES TODO
 %{_bindir}/xwrits
 %{_mandir}/man1/*
 %{_datadir}/pixmaps/xwrits.png
-%{_datadir}/applications/fedora-xwrits.desktop
+%{_datadir}/applications/xwrits.desktop
 
 %changelog
+* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 2.26-4
+- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
+- Cleanup spec as per recently changed packaging guidelines
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list