Accepting request 53858 from Base:System

Accepted submit request 53858 from user puzel

OBS-URL: https://build.opensuse.org/request/show/53858
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tar?expand=0&rev=29

tar-backup-spec-fix-paths.patch

@@ -0,0 +1,19 @@
+Index: tar-1.25/scripts/backup-specs
+===================================================================
+--- tar-1.25.orig/scripts/backup-specs
++++ tar-1.25/scripts/backup-specs
+@@ -11,12 +11,12 @@ TAR=/bin/tar
+ # (Optional) Path to rsh binary or its equivalent. You may wish to
+ # set it to ssh as shown in the example below, to improve security.
+ # In this case you will have to use public key authentication.
+-RSH=/usr/local/bin/ssh
++RSH=/usr/bin/ssh
+ 
+ # (Optional) Path to rsh binary on remote mashines. This will be
+ # passed via --rsh-command option to the remote invocation of
+ # tar
+-RSH_COMMAND=/usr/local/bin/ssh
++RSH_COMMAND=/usr/bin/ssh
+ 
+ # Name of temporary file to hold volume numbers.  This needs to be accessible
+ # by all the machines which have filesystems to be dumped.

tar.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov 24 09:24:11 UTC 2010 - puzel@novell.com
+
+- fix tar-backup-scripts (bnc#654199)
+- add tar-backup-spec-fix-paths.patch
+- cleanup spec
+
 -------------------------------------------------------------------
 Tue Nov  9 13:05:29 UTC 2010 - puzel@novell.com
 

tar.spec

@@ -15,30 +15,29 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           tar
-BuildRequires:  help2man
-Url:            http://www.gnu.org/software/tar/
-License:        GPLv3+
-Group:          System/Base
-Provides:       base:/bin/tar
-PreReq:         %install_info_prereq
-AutoReqProv:    on
 Version:        1.25
 Release:        1
+License:        GPLv3+
 Summary:        GNU implementation of tar ((t)ape (ar)chiver)
-Source0:        %name-%version.tar.bz2
+Url:            http://www.gnu.org/software/tar/
+Group:          System/Base
+Source0:        %{name}-%{version}.tar.bz2
 #
 Patch0:         tar-disable_languages.patch
 Patch1:         tar-disable-listed02-test.patch
 Patch2:         tar-manpage.patch
 Patch3:         tar-wildcards.patch
 Patch5:         tar-fortifysourcessigabrt.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Patch6:         tar-backup-spec-fix-paths.patch
-Recommends:     xz
+BuildRequires:  help2man
+PreReq:         %install_info_prereq
 Recommends:     tar-lang = %version
+Recommends:     xz
+Provides:       base:/bin/tar
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define _bindir  /bin
 
 %description
@@ -49,32 +48,9 @@ into this package. If you are planning to use the remote tape features
 provided by tar you have to also install the 'dump' or the 'star'
 package.
 
-
-
-Authors:
---------
-    Melissa O'Neill <oneill@cs.sfu.ca>
-    Bruno Haible <haible@clisp.cons.org>
-    Dale Worley <worley@ariadne.com>
-    David J. MacKenzie <djm@gnu.org>
-    François Pinard <pinard@iro.umontreal.ca>
-    Gerhard Poul <gpoul@gnu.org>
-    Jay Fenlason <hack@ai.mit.edu>
-    Jeff Dairiki <dairiki@dairiki.org>
-    Jim Kingdon <kingdon@ai.mit.edu>
-    Joy Kendall <jak@hobbes>
-    Machael Stone <mstone@cs.loyola.edu>
-    Michael I Bushnell <mib@gnu.org>
-    Noah Friedman <friedman@gnu.org>
-    Paul Eggert <eggert@twinsun.com>
-    Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
-    The King <elvis@gnu.org>
-    Tom Tromey <tromey@drip.colorado.edu>
-
-
 %package backup-scripts
 License:        GPLv3+
-Summary:        Backup scirpts
+Summary:        Backup scripts
 Group:          Productivity/Archiving/Backup
 Requires:       %{name} = %{version}-%{release}
 
@@ -89,6 +65,7 @@ Shell scripts for system backup/restore
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 rm -f po/no.* po/ky.*
@@ -96,14 +73,9 @@ rm -f po/no.* po/ky.*
 aclocal -I m4
 automake --force --add-missing
 %define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter
-export CFLAGS="$RPM_OPT_FLAGS %my_cflags"
+export CFLAGS="%{optflags} %my_cflags"
 export RSH="/usr/bin/rsh"
-./configure \
+%configure \
-	--prefix=%_prefix \
-	--bindir=%_bindir \
-	--mandir=%_mandir \
-	--infodir=%_infodir \
-	--build=%{_target_cpu}-suse-linux \
 	--enable-backup-scripts \
 	--disable-silent-rules
 make %{?_smp_mflags};
@@ -116,25 +88,29 @@ make %{?_smp_mflags};
 #%endif
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
-install -D -m 644 scripts/backup-specs $RPM_BUILD_ROOT%{_sysconfdir}/backup-specs
+install -d -m 755 %{buildroot}%{_sysconfdir}/backup
-rm -r %buildroot/usr/libexec
+install -D -m 644 scripts/backup-specs %{buildroot}%{_sysconfdir}/backup/backup-specs
-%find_lang %name
+rm -rf %{buildroot}%{_libexecdir}/rmt
+%find_lang %{name}
 
-%files lang -f %name.lang
+%files lang -f %{name}.lang
 
 %files backup-scripts
 %defattr(-,root, root)
-%_sbindir/backup  
+%{_sbindir}/backup
-%_sbindir/restore  
+%{_sbindir}/restore
-%config(noreplace) %{_sysconfdir}/backup-specs  
+%{_libexecdir}/backup.sh
+%{_libexecdir}/dump-remind
+%dir %{_sysconfdir}/backup
+%config(noreplace) %{_sysconfdir}/backup/backup-specs
 
 %files
 %defattr(-, root, root)
-%_bindir/tar
+%{_bindir}/tar
 %doc README* ABOUT-NLS AUTHORS COPYING NEWS THANKS ChangeLog TODO
-%_infodir/tar.info*.gz
+%{_infodir}/tar.info*.gz
-%_mandir/man1/tar.1.gz
+%{_mandir}/man1/tar.1.gz
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
@@ -143,6 +119,6 @@ rm -r %buildroot/usr/libexec
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %changelog