Browse Source

* dejagnu: new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8166 ec354946-7b23-47d6-9f5a-488ba84defc7
shaolin 10 years ago
parent
commit
994574cba0
1 changed files with 33 additions and 27 deletions
  1. 33 27
      d/dejagnu/dejagnu-vl.spec

+ 33 - 27
d/dejagnu/dejagnu-vl.spec

@@ -1,28 +1,28 @@
 Summary:       A front end for testing other programs.
 Summary(ja):   各種プログラムをテストするためのフロントエンド
 Name:          dejagnu
-Version:       1.4.4
-Release:       2%{?_dist_release}
+Version:       1.5.1
+Release:       1%{?_dist_release}
 Epoch:         1
 
 Group:         Development/Tools
 License:       GPLv2
 
 Source:        ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
-Source2:       dejagnu.texi
-Patch1:        dejagnu-1.4.4-smp-1.patch
-Patch3:        dejagnu-1.4.4-testsuite.patch
-Patch4:        dejagnu-1.4.4-runtest.patch
+Patch1:        dejagnu-1.5-smp-1.patch
+Patch2:        dejagnu-1.5-runtest.patch
+Patch3:        dejagnu-1.5-usrmove.patch
+Patch4:        dejagnu-1.5-gfortran.patch
+Patch5:        dejagnu-1.5-aarch64.patch
 
 Requires:      tcl >= 8.0, expect >= 5.21
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildArch:     noarch
-BuildRequires: jadetex docbook-utils-pdf
-BuildRequires: texinfo
+BuildRequires: expect screen texinfo
 
 Vendor:       Project Vine
 Distribution: Vine Linux
-Packager:     MATSUBAYASHI 'Shaolin' Kohji <shaolin@vinelinux.org>
+Packager:     shaolin
 
 
 %description
@@ -38,37 +38,40 @@ into software development).
 %setup -q -n dejagnu-%{version}
 find . -name \*.rej -exec rm {} \;
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
 %configure -v
-makeinfo %{SOURCE2} -o doc/%{name}.info
 
-make
-mv doc/html doc/overview
+%check
 echo ============TESTING===============
-LANG=C make -k check RUNTESTFLAGS="RUNTEST=`pwd`/runtest" || :
+# Dejagnu test suite also has to test reporting to user.  It needs a
+# terminal for that.  That doesn't compute in mock.  Work around it by
+# running the test under screen and communicating back to test runner
+# via temporary file.  If you have better idea, we accept patches.
+TMP=`mktemp`
+screen -D -m sh -c '(make check RUNTESTFLAGS="RUNTEST=`pwd`/runtest"; echo $?) >> '$TMP
+RESULT=`tail -n 1 $TMP`
+cat $TMP
+rm -f $TMP
 echo ============END TESTING===========
-
+exit $RESULT
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall 
-chmod a-x $RPM_BUILD_ROOT/%{_datadir}/dejagnu/runtest.exp
-
-pushd doc
-make man1dir=%{buildroot}%{_mandir}/man1 install-man
-install -D -m 644 dejagnu.info ${RPM_BUILD_ROOT}/%{_infodir}/%{name}.info
-popd
-
-mv $RPM_BUILD_ROOT%{_libexecdir}/config.guess $RPM_BUILD_ROOT%{_datadir}/dejagnu                                                                                
-rm -rf $RPM_BUILD_ROOT%{_libexecdir}
+rm -f %{buildroot}%{_infodir}/dir
+chmod a-x %{buildroot}/%{_datadir}/dejagnu/runtest.exp
+make DESTDIR=%{buildroot} install-man
+install -D -m 644 doc/dejagnu.info %{buildroot}/%{_infodir}/%{name}.info
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -83,7 +86,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc COPYING NEWS README AUTHORS INSTALL ChangeLog doc/overview.pdf
+%doc COPYING NEWS README AUTHORS INSTALL ChangeLog doc/dejagnu.texi
 %{_bindir}/runtest
 %{_datadir}/dejagnu
 %{_includedir}/dejagnu.h
@@ -92,6 +95,9 @@ fi
 
  
 %changelog
+* Mon Jan 13 2014 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1:1.5.1-1
+- updated to 1.5.1; import patches from Fedora; spec cleanup
+
 * Sun May 22 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.4.4-2
 - rebuilt with current VineSeed
 - added BR: texinfo
@@ -100,7 +106,7 @@ fi
 - new versioning policy; spec in UTF-8
 - add Source2, Patch3 and Patch4 from Fedora 1.4.4-13
 
-* Sun Mar 06 2007 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 1.4.4-0vl3
+* Tue Mar 06 2007 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 1.4.4-0vl3
 - rebuilt with gcc-4.1.x
 - imported Patch1 from FC 1.4.4-5