[dejagnu] spec file cleanup and using dejagnu.texi from upstream source

Honza Horak hhorak at fedoraproject.org
Mon Aug 27 11:49:14 UTC 2012


commit 4567231dc014cff0758e5ce3b80c6b48296920b7
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date:   Mon Aug 27 13:44:40 2012 +0200

    spec file cleanup and using dejagnu.texi from upstream source

 dejagnu.spec |   11 +++++------
 sources      |    1 -
 2 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/dejagnu.spec b/dejagnu.spec
index bf962ed..d7294fc 100644
--- a/dejagnu.spec
+++ b/dejagnu.spec
@@ -1,15 +1,13 @@
 Summary: A front end for testing other programs
 Name: dejagnu
 Version: 1.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv3+
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
-Source2: dejagnu.texi
 Group: Development/Tools
 URL: http://www.gnu.org/software/dejagnu/
 Requires: expect
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: expect screen texinfo
 Patch1: dejagnu-1.5-smp-1.patch
@@ -34,7 +32,6 @@ into software development).
 
 %build
 %configure -v
-makeinfo %{SOURCE2} -o doc/%{name}.info
 
 %check
 echo ============TESTING===============
@@ -51,7 +48,6 @@ echo ============END TESTING===========
 exit $RESULT
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 chmod a-x $RPM_BUILD_ROOT/%{_datadir}/dejagnu/runtest.exp
@@ -72,7 +68,6 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
 %doc COPYING NEWS README AUTHORS ChangeLog doc/dejagnu.texi
 %{_bindir}/runtest
 %{_datadir}/dejagnu
@@ -81,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/dejagnu*
 
 %changelog
+* Mon Aug 27 2012 Honza Horak <hhorak at redhat.com> 1:1.5-6
+- Spec file cleanup
+- Use dejagnu.texi from upstream source
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index c42e48a..f0a5687 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 3df1cbca885e751e22d3ebd1ac64dc3c  dejagnu-1.5.tar.gz
-d70aca4d793a8fbdd6906b8ac5333195  dejagnu.texi


More information about the scm-commits mailing list