[joe] - cleaned .spec file

pschiffe pschiffe at fedoraproject.org
Tue Mar 26 15:49:43 UTC 2013


commit 8c20047d7ef3b1351552bb8723dfa65f3e6fa61c
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Tue Mar 26 16:39:14 2013 +0100

    - cleaned .spec file

 joe.spec |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/joe.spec b/joe.spec
index fe36921..b79eafc 100644
--- a/joe.spec
+++ b/joe.spec
@@ -1,18 +1,19 @@
 Summary: An easy to use, modeless text editor
 Name: joe
 Version: 3.7
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: Applications/Editors
-Source: http://downloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
 URL: http://sourceforge.net/projects/joe-editor/
-BuildRequires: ncurses-devel libselinux-devel
+Source: http://downloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
+
 Patch0: joe-3.7-joerc.patch
-Patch2: joe-3.4-selinux.patch
-Patch3: joe-3.5-time.patch
-Patch4: joe-3.7-orphan.patch
-Patch5: joe-3.7-indent-ow.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: joe-3.4-selinux.patch
+Patch2: joe-3.5-time.patch
+Patch3: joe-3.7-orphan.patch
+Patch4: joe-3.7-indent-ow.patch
+
+BuildRequires: ncurses-devel libselinux-devel
 
 %description
 Joe is a powerful, easy to use, modeless text editor.
@@ -22,10 +23,10 @@ environment.
 %prep
 %setup -q
 %patch0 -p1 -b .joerc
-%patch2 -p1 -b .selinux
-%patch3 -p1 -b .time
-%patch4 -p1 -b .orphan
-%patch5 -p1 -b .of
+%patch1 -p1 -b .selinux
+%patch2 -p1 -b .time
+%patch3 -p1 -b .orphan
+%patch4 -p1 -b .of
 iconv -f koi8-r -t utf-8 ./man/ru/joe.1.in >./man/ru/joe.1.in.aux
 touch -r ./man/ru/joe.1.in ./man/ru/joe.1.in.aux
 mv ./man/ru/joe.1.in.aux ./man/ru/joe.1.in
@@ -41,7 +42,6 @@ mv ChangeLog.tmp ChangeLog
 make  %{?_smp_mflags}
 
 %install
-rm -fr $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT PACKAGE_TARNAME=joe-%{version}
 
 # This is automatically compressed afterwards...
@@ -52,9 +52,7 @@ ln -s joe.1 jstar.1
 ln -s joe.1 rjoe.1
 popd
 
-
 %files
-%defattr(-,root,root,-)
 %doc README TODO HINTS NEWS LIST COPYING
 %{_bindir}/*
 %dir /etc/joe
@@ -63,10 +61,10 @@ popd
 %{_mandir}/ru/man1/*
 %{_datadir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %changelog
+* Tue Mar 26 2013 Peter Schiffer <pschiffe at redhat.com> - 3.7-11
+- cleaned .spec file
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list