Accepting request 291076 from home:pluskalm:branches:Archiving

- Add gpg signature
- Correct info scriplet dependencies
- Cleanup spec file with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/291076
OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=54

cpio.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cpio
 #
-# Copyright (c) 2015 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,15 +17,15 @@
 
 
 Name:           cpio
-Url:            http://www.gnu.org/software/cpio/cpio.html
-BuildRequires:  autoconf
-BuildRequires:  automake
 Version:        2.11
 Release:        0
 Summary:        A Backup and Archiving Utility
 License:        GPL-3.0
 Group:          Productivity/Archiving/Backup
-Source:         http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
+Url:            http://www.gnu.org/software/cpio/cpio.html
+Source0:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
+Source1:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2.sig
+Source2:        %{name}.keyring
 Patch2:         cpio-use_new_ascii_format.patch
 #oouch what a ...?! pieces of code grabed from mt_st package to add missing functionality (e.g. density info)
 Patch3:         cpio-mt.patch
@@ -44,10 +44,12 @@ Patch23:        paxutils-rtapelib_mtget.patch
 Patch24:        cpio-check_for_symlinks.patch
 Patch25:        cpio-fix_truncation_check.patch
 Patch26:        0001-Fix-memory-overrun-on-reading-improperly-created-lin.patch
-
-PreReq:         %install_info_prereq
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  autoconf
+BuildRequires:  automake
+Requires(post): %{install_info_prereq}
+Requires(preun): %{install_info_prereq}
 Recommends:     %{name}-lang = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 GNU cpio is a program to manage archives of files. This package also
@@ -61,18 +63,12 @@ is a compatible 'rmt' in the 'dump' package, 'rmt' is not included in
 this package. If you are planning to use the remote tape features
 provided by cpio, install the 'dump' package as well.
 
-
-
-Authors:
---------
-    David J. MacKenzie <djm@gnu.org>
-    Jim Meyering <meyering@na-net.ornl.gov>
-
 %lang_package
+
 %prep
-%setup
-%patch2 
-%patch3 
+%setup -q
+%patch2
+%patch3
 %patch4
 %patch5
 %patch15
@@ -92,7 +88,7 @@ Authors:
 %build
 gettextize -f
 autoreconf --force --install
-CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fPIE" \
+CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fPIE" \
 LDFLAGS="-pie" \
 ./configure  \
     --with-rmt="%{_sysconfdir}/rmt" \
@@ -105,31 +101,32 @@ LDFLAGS="-pie" \
 make %{?_smp_mflags}
 
 %install
-mkdir -p $RPM_BUILD_ROOT/{usr/bin,bin}
-make prefix=$RPM_BUILD_ROOT/usr infodir=$RPM_BUILD_ROOT/%_infodir mandir=$RPM_BUILD_ROOT/%_mandir install
-#UsrMerge 
-ln -sf %_bindir/cpio $RPM_BUILD_ROOT/bin
-#EndUsrMerge 
+mkdir -p %{buildroot}/{usr/bin,bin}
+make prefix=%{buildroot}/usr infodir=%{buildroot}/%{_infodir} mandir=%{buildroot}/%{_mandir} install
+#UsrMerge
+ln -sf %{_bindir}/cpio %{buildroot}/bin
+#EndUsrMerge
 %find_lang %{name}
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
-%postun
+%preun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
 %files
 %defattr(-,root,root)
-#UsrMerge 
+#UsrMerge
 /bin/cpio
-#EndUsrMerge 
-%_bindir/cpio
-%_bindir/mt
+#EndUsrMerge
+%{_bindir}/cpio
+%{_bindir}/mt
 %doc %{_infodir}/cpio.info.gz
 %doc %{_mandir}/man1/cpio.1.gz
 %doc %{_mandir}/man1/mt.1.gz
 #/usr/share/locale/*/LC_MESSAGES/cpio.mo
 
 %files lang -f %{name}.lang
+%defattr(-,root,root)
 
 %changelog