From 565e58b36844c299314cb8c190517bbb32793363a9888f45669e60039422dd31 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 8 Apr 2014 19:11:44 +0000 Subject: [PATCH] Accepting request 229388 from home:Andreas_Schwab:Factory - Update to dejagnu 1.5.1 1. The runtest.1 man page has been brought up to date. 2. The Docbook/SGML documentation files were removed in favour of the Docbook/XML documentation. The Texinfo source for the Info pages is now automatically generated from the Docbook source. 3. The Makefile structure has been substantially simplified. There is now a single top-level Makefile.am. The use of recursive make has been eliminated. 4. lib/mondfe.exp and lib/xsh.exp have been removed. Users requiring these communication modes can still use the DejaGnu 1.4 branch or can contact dejagnu@gnu.org to discuss reinstating these files. 5. The configure script now ensures that Expect is installed and that it is linked against Tcl 8.3 or greater. 6. The runtest program now gracefully handles the possibility of the expect binary vanishing after DejaGnu has been installed (for example, by the user altering their PATH). 7. The user-visible utility procedures `absolute', `prune', `psource' and `slay' are deprecated and will be removed in the next release. If a testsuite uses any of these procedures, a copy of the procedure should be made and placed in the lib directory of the testsuite. - dejagnu-ignore-libwarning.patch: Removed - dejagnu-make_doc.patch: Removed - Build as noarch OBS-URL: https://build.opensuse.org/request/show/229388 OBS-URL: https://build.opensuse.org/package/show/devel:tools/dejagnu?expand=0&rev=13 --- dejagnu-1.4.4.tar.gz | 3 -- dejagnu-1.5.1.tar.gz | 3 ++ dejagnu-ignore-libwarning.patch | 20 ------------ dejagnu-make_doc.patch | 28 ---------------- dejagnu.changes | 28 ++++++++++++++++ dejagnu.spec | 58 +++++++++------------------------ 6 files changed, 46 insertions(+), 94 deletions(-) delete mode 100644 dejagnu-1.4.4.tar.gz create mode 100644 dejagnu-1.5.1.tar.gz delete mode 100644 dejagnu-ignore-libwarning.patch delete mode 100644 dejagnu-make_doc.patch diff --git a/dejagnu-1.4.4.tar.gz b/dejagnu-1.4.4.tar.gz deleted file mode 100644 index 0b5a02a..0000000 --- a/dejagnu-1.4.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d -size 1080346 diff --git a/dejagnu-1.5.1.tar.gz b/dejagnu-1.5.1.tar.gz new file mode 100644 index 0000000..7d2e019 --- /dev/null +++ b/dejagnu-1.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60e747d1a4c5c7f76bee649bb9641e66f9605548b2761435aca09f88094433d2 +size 579277 diff --git a/dejagnu-ignore-libwarning.patch b/dejagnu-ignore-libwarning.patch deleted file mode 100644 index 5cc9838..0000000 --- a/dejagnu-ignore-libwarning.patch +++ /dev/null @@ -1,20 +0,0 @@ -dejagnu/ChangeLog - * lib/target.exp (prune_warnings): Correct pic/PIC regexp. - Ignore incompatible library warning. - -Index: dejagnu/lib/target.exp -================================================================================ ---- dejagnu-1.4.4/lib/target.exp -+++ dejagnu-1.4.4/lib/target.exp -@@ -277,7 +277,10 @@ - regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*is not implemented and will always fail\[^\n\]*" $text "" text - - # Cygwin cc1 warns about -fpic and -fPIC -- regsub -all ".*: warning: -f(pic|PIC) ignored for target .*" $text "" text -+ regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target \[^\n\]*" $text "" text -+ -+ # Ignore linker warning when searching 64bit libraries in /lib. -+ regsub -all "(^|\n)\[^\n\]*: skipping incompatible \[^\n\]* when searching for \[^\n\]*" $text "" text - - # It might be tempting to get carried away and delete blank lines, etc. - # Just delete *exactly* what we're ask to, and that's it. diff --git a/dejagnu-make_doc.patch b/dejagnu-make_doc.patch deleted file mode 100644 index c98e5b2..0000000 --- a/dejagnu-make_doc.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- doc/Makefile.am -+++ doc/Makefile.am -@@ -44,7 +44,7 @@ - src=$(srcdir); \ - dir=`(cd $${src}; pwd)`; \ - mkdir html; \ -- $(DOCBOOK)/db2html -o html $${dir}/$*.sgml -+ $(DOCBOOK)/db2html $${dir}/$*.sgml - - # now for some extra dependencies that the automatic rules will not - # catch: -@@ -58,10 +58,10 @@ - clean realclean distclean: - rm -fr $(TARGETS) DBHTOHTML* html dejagnu.info* overview.junk overview overview.{aux,dvi,log,ps,pdf,tex} - --install-doc: $(TARGETS) -- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html $(DESTDIR)$(pkgdatadir)/html/stylesheet-images -+install-doc: -+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html - $(INSTALL_DATA) html/*.html $(DESTDIR)$(pkgdatadir)/html -- $(INSTALL_DATA) overview.rtf $(DESTDIR)$(pkgdatadir)/dejagnu.rtf -- $(INSTALL_DATA) overview.ps $(DESTDIR)$(pkgdatadir)/dejagnu.ps -- $(INSTALL_DATA) overview.pdf $(DESTDIR)$(pkgdatadir)/dejagnu.pdf -- $(INSTALL_DATA) $(srcdir)/runtest.1 $(mandir)/man1/ -+ test -r overview.rtf && $(INSTALL_DATA) overview.rtf $(DESTDIR)$(pkgdatadir)/dejagnu.rtf -+ test -r overview.ps && $(INSTALL_DATA) overview.ps $(DESTDIR)$(pkgdatadir)/dejagnu.ps -+ test -r overview.pdf && $(INSTALL_DATA) overview.pdf $(DESTDIR)$(pkgdatadir)/dejagnu.pdf -+ $(INSTALL_DATA) $(srcdir)/runtest.1 $(DESTDIR)$(mandir)/man1/ diff --git a/dejagnu.changes b/dejagnu.changes index 1879842..18c50e0 100644 --- a/dejagnu.changes +++ b/dejagnu.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Tue Apr 8 09:50:28 UTC 2014 - schwab@suse.de + +- Update to dejagnu 1.5.1 + 1. The runtest.1 man page has been brought up to date. + 2. The Docbook/SGML documentation files were removed in favour of the + Docbook/XML documentation. The Texinfo source for the Info pages is + now automatically generated from the Docbook source. + 3. The Makefile structure has been substantially simplified. There + is now a single top-level Makefile.am. The use of recursive make + has been eliminated. + 4. lib/mondfe.exp and lib/xsh.exp have been removed. Users requiring + these communication modes can still use the DejaGnu 1.4 branch or + can contact dejagnu@gnu.org to discuss reinstating these files. + 5. The configure script now ensures that Expect is installed and that + it is linked against Tcl 8.3 or greater. + 6. The runtest program now gracefully handles the possibility of the + expect binary vanishing after DejaGnu has been installed (for + example, by the user altering their PATH). + 7. The user-visible utility procedures `absolute', `prune', `psource' + and `slay' are deprecated and will be removed in the next release. + If a testsuite uses any of these procedures, a copy of the + procedure should be made and placed in the lib directory of the + testsuite. +- dejagnu-ignore-libwarning.patch: Removed +- dejagnu-make_doc.patch: Removed +- Build as noarch + ------------------------------------------------------------------- Fri Mar 22 12:17:45 UTC 2013 - mmeister@suse.com diff --git a/dejagnu.spec b/dejagnu.spec index a08f73c..679c2bd 100644 --- a/dejagnu.spec +++ b/dejagnu.spec @@ -1,7 +1,7 @@ # # spec file for package dejagnu # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,11 @@ Name: dejagnu -BuildRequires: automake +BuildRequires: expect Requires: expect +Requires: info Requires: tcl -Version: 1.4.4 +Version: 1.5.1 Release: 0 Summary: Framework for Running Test Suites on Software Tools License: GPL-2.0+ @@ -28,9 +29,8 @@ Group: Development/Tools/Building Url: http://www.gnu.org/software/dejagnu/ Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz Source1: site.exp -Patch0: %{name}-make_doc.patch -Patch4: dejagnu-ignore-libwarning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description DejaGnu is a framework for testing other programs. Its purpose is to @@ -59,60 +59,32 @@ suites themselves. %prep %setup -q -n %{name}-%{version} -%patch0 -%patch4 -p1 -# argh, auto* requires this file -touch example/calc/ChangeLog %build -autoreconf -f -i -%configure --verbose +%configure make %{?_smp_mflags} -#cd doc -#makeinfo dejagnu.texi %install make install DESTDIR=$RPM_BUILD_ROOT -#install -d $RPM_BUILD_ROOT%{_defaultdocdir}/dejagnu install -d $RPM_BUILD_ROOT%{_sysconfdir}/dejagnu -#install -d $RPM_BUILD_ROOT%{_datadir}/dejagnu install %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/dejagnu/site.exp ln -s -f %{_sysconfdir}/dejagnu/site.exp $RPM_BUILD_ROOT%{_datadir}/dejagnu/site.exp -# -# install doc -make install-doc \ - DESTDIR=$RPM_BUILD_ROOT \ - mandir=%{_mandir} \ - pkgdatadir=%{_docdir}/dejagnu \ - install-doc -# we currently don't want some doc... -rm -f $RPM_BUILD_ROOT%{_defaultdocdir}/dejagnu/{dejagnu.ps,dejagnu.rtf} -# add some text files -install -m 644 ChangeLog COPYING NEWS README AUTHORS TODO $RPM_BUILD_ROOT%{_defaultdocdir}/dejagnu/ -# install examples -install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/dejagnu/example -# examples -for exmp in calc hello ; do - cp -r example/$exmp $RPM_BUILD_ROOT%{_defaultdocdir}/dejagnu/example/ - pushd $RPM_BUILD_ROOT%{_defaultdocdir}/dejagnu/example/$exmp; - autoreconf -fi - make distclean - rm -rf *~ autom4te.cache - popd -done -# info pages -#mkdir -p $RPM_BUILD_ROOT/%{_infodir} -#install -m 644 doc/dejagnu.info* $RPM_BUILD_ROOT/%{_infodir} + +%post +%install_info --info-dir=%{_infodir} %{_infodir}/dejagnu.info.gz + +%postun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/dejagnu.info.gz %files %defattr(-, root, root) -%doc %{_defaultdocdir}/dejagnu +%doc ChangeLog COPYING NEWS README AUTHORS TODO %dir %{_datadir}/dejagnu %dir %{_sysconfdir}/dejagnu /usr/bin/runtest -%doc %{_mandir}/man1/* +%doc %{_mandir}/man1/*.gz +%doc %{_infodir}/*.gz /usr/include/* -#%doc %{_infodir}/* %config(noreplace) %{_sysconfdir}/dejagnu/site.exp %{_datadir}/dejagnu/*