Accepting request 287958 from home:pluskalm:branches:Base:System

- Clean spec file with spec-cleaner
- Refresh dependencies
- Add gpg signature

OBS-URL: https://build.opensuse.org/request/show/287958
OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=37

mtools-4.0.18.tar.bz2.sig

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlDt05QACgkQyAYxsm9DGWGoRACfQnFR1XezqJwCgxlVIR0ySawi
+ctkAnjwhcKyETgbQTvaYXFrF07LzCp/u
+=a4UP
+-----END PGP SIGNATURE-----

mtools.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb 26 15:20:48 UTC 2015 - mpluskal@suse.com
+
+- Clean spec file with spec-cleaner
+- Refresh dependencies
+- Add gpg signature
+
 -------------------------------------------------------------------
 Tue Apr 16 10:10:15 UTC 2013 - idonmez@suse.com
 

mtools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mtools
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX 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,29 +17,33 @@
 
 
 Name:           mtools
-BuildRequires:  autoconf
-BuildRequires:  libpng
-%if %suse_version > 1220
-BuildRequires:  makeinfo
-BuildRequires:  texinfo
-%else
-BuildRequires:  texlive-latex
-%endif
-BuildRequires:  xorg-x11
-BuildRequires:  xorg-x11-devel
 Version:        4.0.18
 Release:        0
-Url:            http://mtools.linux.lu/
 Summary:        Access Files on an MS-DOS File System
 License:        GPL-3.0+
 Group:          System/Filesystems
-Source:         http://ftp.gnu.org/gnu/mtools/%{name}-%{version}.tar.bz2
+Url:            http://mtools.linux.lu/
+Source0:        http://ftp.gnu.org/gnu/mtools/%{name}-%{version}.tar.bz2
+Source1:        http://ftp.gnu.org/gnu/mtools/%{name}-%{version}.tar.bz2.sig
+Source2:        %{name}.keyring
 Patch0:         %{name}-%{version}-conf.diff
 Patch1:         %{name}-%{version}-autoconf.diff
 Patch3:         %{name}-%{version}-aliasing.diff
 Patch4:         %{name}-%{version}-fat-bits.diff
 Patch5:         %{name}-%{version}-prototypes.diff
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libXau-devel
+BuildRequires:  libtool
+BuildRequires:  xorg-x11-devel
+Requires(pre):  %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1220
+BuildRequires:  makeinfo
+BuildRequires:  texinfo
+%else
+BuildRequires:  texlive-latex
+%endif
 
 %description
 Mtools allows uncomplicated access to an MS-DOS file system on disk
@@ -80,17 +84,16 @@ XDF support for OS/2 is also provided.
 %patch5
 
 %build
-autoconf --force
+autoreconf -fi
-export CC=gcc
-export INSTALL_PROGRAM="install"
 %configure \
-    --includedir=/usr/src/linux/include
+	--includedir=%{_prefix}/src/linux/include
-make all dvi info
+
+make %{?_smp_mflags} all info pdf
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}
+install -d -m 755 %{buildroot}%{_sysconfdir}
-make install DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} install --jobs 1
-cp -p mtools.conf $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p mtools.conf %{buildroot}%{_sysconfdir}
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/mtools.info.gz
@@ -98,9 +101,6 @@ cp -p mtools.conf $RPM_BUILD_ROOT%{_sysconfdir}
 %postun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/mtools.info.gz
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %config %{_sysconfdir}/mtools.conf
@@ -118,6 +118,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root)
-%doc *.dvi
+%doc *.pdf
 
 %changelog