[xfce4-clipman-plugin] Clean up specfile

Christoph Wickert cwickert at fedoraproject.org
Sat Mar 12 12:47:16 UTC 2011


commit 92d2c2007db9b520e0fe8ca3513b54965f747263
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Mar 12 13:47:09 2011 +0100

    Clean up specfile

 xfce4-clipman-plugin.spec |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/xfce4-clipman-plugin.spec b/xfce4-clipman-plugin.spec
index ccc98a8..63b30ec 100644
--- a/xfce4-clipman-plugin.spec
+++ b/xfce4-clipman-plugin.spec
@@ -1,3 +1,7 @@
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=173657
+
+%global minorversion 1.1
+
 Name:           xfce4-clipman-plugin
 Version:        1.1.3
 Release:        4%{?dist}
@@ -6,17 +10,15 @@ Summary:        Clipboard manager plugin for the Xfce panel
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/1.1/%{name}-%{version}.tar.bz2
+Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
 # https://bugzilla.redhat.com/show_bug.cgi?id=552892
 # https://bugzilla.redhat.com/show_bug.cgi?id=552895
 # fixed with a rebased version of
 # http://git.xfce.org/panel-plugins/xfce4-clipman-plugin/commit/?id=d06e35ee62a0477adc84b5d7aeb29e348bb0b813
 Patch0:         xfce4-clipman-plugin-1.1.3-fix-possible-NULL-values.patch
-#
 # build with 4.7.x exo
 # http://bugzilla.xfce.org/show_bug.cgi?id=6853
-#
-Patch1:		xfce4-clipman-plugin-1.1.3-use-exo.patch
+Patch1:         xfce4-clipman-plugin-1.1.3-use-exo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0
@@ -45,18 +47,16 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 %find_lang %{name}
 
 desktop-file-install                                      \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-  --add-category=X-Xfce                                   \
   --delete-original                                       \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 desktop-file-install                                      \
   --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart     \
-  --add-category=X-Xfce                                   \
   --delete-original                                       \
   ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
 


More information about the scm-commits mailing list