Accepting request 290929 from devel:tools

- Add gpg signature
- Add dependencies for macros dealing with info files
- Use fdupes to avoid duplicate files
- Small spec file cleanup by spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/290929
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dejagnu?expand=0&rev=23

dejagnu.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Mar 14 14:16:30 UTC 2015 - mpluskal@suse.com
+
+- Add gpg signature
+- Add dependencies for macros dealing with info files
+- Use fdupes to avoid duplicate files
+- Small spec file cleanup by spec-cleaner
+
 -------------------------------------------------------------------
 Mon Feb  9 09:08:12 UTC 2015 - schwab@suse.de
 

dejagnu.keyring

@@ -0,0 +1,87 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+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
+=LOkw
+-----END PGP PUBLIC KEY BLOCK-----

dejagnu.spec

@@ -17,18 +17,23 @@
 
 
 Name:           dejagnu
-BuildRequires:  expect
-Requires:       expect
-Requires:       info
-Requires:       tcl
 Version:        1.5.2
 Release:        0
 Summary:        Framework for Running Test Suites on Software Tools
 License:        GPL-2.0+
 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
+Source0:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Source1:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
+Source2:        %{name}.keyring
+Source3:        site.exp
+BuildRequires:  expect
+BuildRequires:  fdupes
+Requires:       expect
+Requires:       info
+Requires:       tcl
+Requires(post): %install_info_prereq
+Requires(preun): %install_info_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -58,22 +63,23 @@ Running tests requires two things: the testing framework and the test
 suites themselves.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/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
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+install -d %{buildroot}%{_sysconfdir}/dejagnu
+install %{SOURCE3} %{buildroot}%{_sysconfdir}/dejagnu/site.exp
+ln -s -f %{_sysconfdir}/dejagnu/site.exp %{buildroot}%{_datadir}/dejagnu/site.exp
+%fdupes -s %{buildroot}
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/dejagnu.info.gz
 
-%postun
+%preun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/dejagnu.info.gz
 
 %files
@@ -81,10 +87,10 @@ ln -s -f %{_sysconfdir}/dejagnu/site.exp $RPM_BUILD_ROOT%{_datadir}/dejagnu/site
 %doc ChangeLog COPYING NEWS README AUTHORS TODO
 %dir %{_datadir}/dejagnu
 %dir %{_sysconfdir}/dejagnu
-/usr/bin/runtest
+%{_bindir}/runtest
 %doc %{_mandir}/man1/*.gz
 %doc %{_infodir}/*.gz
-/usr/include/*
+%{_includedir}/*
 %config(noreplace) %{_sysconfdir}/dejagnu/site.exp
 %{_datadir}/dejagnu/*