From e23d943196e3725cc276b3ac3880f9a7e2da569e Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Jan 13 2010 12:11:06 +0000
Subject: new upstream release 1.5.1


---

diff --git a/.cvsignore b/.cvsignore
index ee2dc0f..587c598 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-star-1.5.tar.bz2
+star-1.5.1.tar.bz2
diff --git a/sources b/sources
index bbb9439..fa66c12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a7b1a5e830935cc1bf1001a558c7f8c4  star-1.5.tar.bz2
+f9a28f83702624c4c08ef1a343014c7a  star-1.5.1.tar.bz2
diff --git a/star-1.5-newMake.patch b/star-1.5-newMake.patch
index d2406d4..f41a0bd 100644
--- a/star-1.5-newMake.patch
+++ b/star-1.5-newMake.patch
@@ -11,12 +11,13 @@
  
  ###########################################################################
  #
-@@ -40,20 +40,20 @@ __LINUX_SRC_INCLUDE=	$(_LINUX_SRC_INCLUD
+@@ -40,22 +40,21 @@ __LINUX_SRC_INCLUDE=	$(_LINUX_SRC_INCLUD
  LINUX_SRC_INCLUDE=      $(__LINUX_SRC_INCLUDE:$(_UNIQ)no%=%)
  
  DEFINCDIRS=	$(SRCROOT)/include
 -LDPATH=		-L/opt/schily/lib
--RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
+-#RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
+-RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib
 +LDPATH= 
 +RUNPATH= 
  
@@ -27,14 +28,15 @@
  ###########################################################################
 -INS_BASE=	/opt/schily
 -INS_KBASE=	/
+-INS_RBASE=	/
 +INS_BASE=	$(RPM_INSTALLDIR)/usr/
 +INS_KBASE=	$(RPM_INSTALLDIR)/
++INS_RBASE=	$(RPM_INSTALLDIR)/
  #
  DEFUMASK=	002
  #
  DEFINSMODEF=	444
  DEFINSMODEX=	755
--DEFINSUSR=	bin
+ DEFINSUSR=	root
 -DEFINSGRP=	bin
-+DEFINSUSR=	root
 +DEFINSGRP=	root
diff --git a/star-1.5-removenames_c.patch b/star-1.5-removenames_c.patch
deleted file mode 100644
index 0ebb221..0000000
--- a/star-1.5-removenames_c.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -urNp star-1.5-orig/star/cpio.mk star-1.5/star/cpio.mk
---- star-1.5-orig/star/cpio.mk	2009-01-28 09:46:18.000000000 +0100
-+++ star-1.5/star/cpio.mk	2009-01-28 09:47:00.000000000 +0100
-@@ -25,7 +25,7 @@ CFILES=		cpio.c header.c cpiohdr.c xhead
- 		list.c extract.c create.c append.c diff.c restore.c \
- 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
- 		buffer.c dirtime.c lhash.c \
--		hole.c longnames.c names.c \
-+		hole.c longnames.c \
- 		movearch.c table.c props.c \
- 		unicode.c \
- 		subst.c volhdr.c \
-diff -urNp star-1.5-orig/star/gnutar.mk star-1.5/star/gnutar.mk
---- star-1.5-orig/star/gnutar.mk	2009-01-28 09:46:18.000000000 +0100
-+++ star-1.5/star/gnutar.mk	2009-01-28 09:47:13.000000000 +0100
-@@ -25,7 +25,7 @@ CFILES=		gnutar.c header.c cpiohdr.c xhe
- 		list.c extract.c create.c append.c diff.c restore.c \
- 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
- 		buffer.c dirtime.c lhash.c \
--		hole.c longnames.c names.c \
-+		hole.c longnames.c \
- 		movearch.c table.c props.c \
- 		unicode.c \
- 		subst.c volhdr.c \
-diff -urNp star-1.5-orig/star/pax.mk star-1.5/star/pax.mk
---- star-1.5-orig/star/pax.mk	2009-01-28 09:46:18.000000000 +0100
-+++ star-1.5/star/pax.mk	2009-01-28 09:47:32.000000000 +0100
-@@ -26,7 +26,7 @@ CFILES=		pax.c header.c cpiohdr.c xheade
- 		list.c extract.c create.c append.c diff.c restore.c \
- 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
- 		buffer.c dirtime.c lhash.c \
--		hole.c longnames.c names.c \
-+		hole.c longnames.c \
- 		movearch.c table.c props.c \
- 		unicode.c \
- 		subst.c volhdr.c \
-diff -urNp star-1.5-orig/star/star.mk star-1.5/star/star.mk
---- star-1.5-orig/star/star.mk	2009-01-28 09:46:18.000000000 +0100
-+++ star-1.5/star/star.mk	2009-01-28 09:49:05.000000000 +0100
-@@ -26,7 +26,7 @@ CFILES=		star.c header.c cpiohdr.c xhead
- 		list.c extract.c create.c append.c diff.c restore.c \
- 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
- 		buffer.c dirtime.c lhash.c \
--		hole.c longnames.c names.c \
-+		hole.c longnames.c \
- 		movearch.c table.c props.c \
- 		unicode.c \
- 		subst.c volhdr.c \
-diff -urNp star-1.5-orig/star/suntar.mk star-1.5/star/suntar.mk
---- star-1.5-orig/star/suntar.mk	2009-01-28 09:46:18.000000000 +0100
-+++ star-1.5/star/suntar.mk	2009-01-28 09:51:01.000000000 +0100
-@@ -25,7 +25,7 @@ CFILES=		suntar.c header.c cpiohdr.c xhe
- 		list.c extract.c create.c append.c diff.c restore.c \
- 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
- 		buffer.c dirtime.c lhash.c \
--		hole.c longnames.c names.c \
-+		hole.c longnames.c \
- 		movearch.c table.c props.c \
- 		unicode.c \
- 		subst.c volhdr.c \
diff --git a/star-1.5-selinux.patch b/star-1.5-selinux.patch
index 40cab2a..89b9d52 100644
--- a/star-1.5-selinux.patch
+++ b/star-1.5-selinux.patch
@@ -1,6 +1,6 @@
-diff -urNp star-1.5-orig/conf/configure.in star-1.5/conf/configure.in
---- star-1.5-orig/conf/configure.in	2008-03-27 19:58:16.000000000 +0100
-+++ star-1.5/conf/configure.in	2008-12-18 16:11:49.000000000 +0100
+diff -urNp star-1.5.1-orig/autoconf/configure.in star-1.5.1/autoconf/configure.in
+--- star-1.5.1-orig/autoconf/configure.in
++++ star-1.5.1/autoconf/configure.in
 @@ -452,6 +452,15 @@ AC_CHECK_FUNCS(sched_yield)
  AC_CHECK_FUNCS(nanosleep)
  LIBS="$ac_save_LIBS"
@@ -17,21 +17,24 @@ diff -urNp star-1.5-orig/conf/configure.in star-1.5/conf/configure.in
  dnl Misc OS checks.
  AC_MSG_CHECKING(for /dev/tty)
  if test -r /dev/tty; then
-@@ -543,5 +552,6 @@ AC_SUBST(lib_secdb)
+@@ -543,6 +552,7 @@ AC_SUBST(lib_secdb)
  AC_SUBST(lib_gen)
  AC_SUBST(lib_pthread)
  AC_SUBST(lib_rt)
 +AC_SUBST(lib_selinux)
+ AC_SUBST(lib_dl)
+ AC_SUBST(lib_dir)
  
- AC_OUTPUT(rules.cnf)
-diff -urNp star-1.5-orig/conf/rules.cnf.in star-1.5/conf/rules.cnf.in
---- star-1.5-orig/conf/rules.cnf.in	2008-02-20 18:52:09.000000000 +0100
-+++ star-1.5/conf/rules.cnf.in	2008-12-18 16:09:30.000000000 +0100
-@@ -21,3 +21,4 @@ LIB_SECDB = @lib_secdb@
+diff -urNp star-1.5.1-orig/conf/rules.cnf.in star-1.5.1/conf/rules.cnf.in
+--- star-1.5.1-orig/autoconf/rules.cnf.in
++++ star-1.5.1/autoconf/rules.cnf.in
+@@ -21,5 +21,6 @@ LIB_SECDB = @lib_secdb@
  LIB_GEN = @lib_gen@
  LIB_PTHREAD = @lib_pthread@
  LIB_RT = @lib_rt@
 +LIB_SELINUX = @lib_selinux@
+ LIB_DL= @lib_dl@
+ LIB_DIR= @lib_dir@
 diff -urNp star-1.5-orig/star/cpio.mk star-1.5/star/cpio.mk
 --- star-1.5-orig/star/cpio.mk	2008-04-06 20:01:45.000000000 +0200
 +++ star-1.5/star/cpio.mk	2008-12-18 16:00:27.000000000 +0100
@@ -93,82 +96,6 @@ diff -urNp star-1.5-orig/star/gnutar.mk star-1.5/star/gnutar.mk
  XMK_FILE=	gnutarman.mk
  
  ###########################################################################
-diff -urNp star-1.5-orig/star/Makefile star-1.5/star/Makefile
---- star-1.5-orig/star/Makefile	2008-04-06 20:02:25.000000000 +0200
-+++ star-1.5/star/Makefile	2008-12-18 16:02:39.000000000 +0100
-@@ -1,66 +1,19 @@
--#ident @(#)star_fat.mk	1.23 08/04/06 
-+#ident @(#)all.mk	1.1 05/02/16 
- ###########################################################################
--#include		$(MAKE_M_ARCH).def
- SRCROOT=	..
- RULESDIR=	RULES
- include		$(SRCROOT)/$(RULESDIR)/rules.top
- ###########################################################################
- 
- #
--# This is star_fat.mk, it creates one "fat" binary for all functionality.
-+# This is all.mk, it creates sevral binaries, one for each function.
- #
--# If you like to create non "fat" binaries, remove Makefile
--# and copy all.mk to Makefile.
-+# If you like to create one single "fat" binary, remove Makefile
-+# and copy star_fat.mk to Makefile.
- #
--INSDIR=		bin
--TARGET=		star
--#SYMLINKS=	ustar tar
--SYMLINKS=	ustar tar gnutar suntar scpio spax
--CPPOPTS +=	-D__STAR__
--CPPOPTS +=	-DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH
--#CPPOPTS +=	-DSET_CTIME -DFIFO -DUSE_MMAP
--#CPPOPTS +=	-DSET_CTIME -DUSE_MMAP
--#CPPOPTS +=	-DFIFO -DUSE_MMAP
--CPPOPTS +=	-DUSE_LARGEFILES
--CPPOPTS +=	-DUSE_FIND
--CPPOPTS +=	-DUSE_ACL
--CPPOPTS +=	-DUSE_XATTR
--CPPOPTS +=	-DUSE_FFLAGS
--CPPOPTS +=	-DCOPY_LINKS_DELAYED
--CPPOPTS +=	-DSTAR_FAT
--CPPOPTS +=	-DSCHILY_PRINT
--CFILES=		star_fat.c header.c cpiohdr.c xheader.c xattr.c \
--		list.c extract.c create.c append.c diff.c restore.c \
--		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
--		buffer.c dirtime.c lhash.c \
--		hole.c longnames.c \
--		movearch.c table.c props.c \
--		unicode.c \
--		subst.c volhdr.c \
--		chdir.c match.c defaults.c dumpdate.c \
--		fifo.c device.c checkerr.c \
--		\
--		findinfo.c
- 
--HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
--		movearch.h table.h props.h fifo.h diff.h restore.h \
--		checkerr.h dumpdate.h bitstring.h
--
--#LIBS=		-lunos
--#LIBS=		-lschily -lc /usr/local/lib/gcc-gnulib
--LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
--#
--#	Wenn -lfind, dann auch  $(LIB_INTL)
--#
--XMK_FILE=	Makefile.man starformatman.mk scpioman.mk gnutarman.mk \
--		spaxman.mk suntarman.mk Makefile.dfl Makefile.doc
--
--star_fat.c: star.c
--	$(RM) $(RM_FORCE) $@; cp star.c $@
-+MK_FILES= star.mk pax.mk suntar.mk gnutar.mk cpio.mk 
- 
- ###########################################################################
--include		$(SRCROOT)/$(RULESDIR)/rules.cmd
-+include		$(SRCROOT)/$(RULESDIR)/rules.mks
- ###########################################################################
--count:	$(CFILES) $(HFILES)
--	count $r1
--
 diff -urNp star-1.5-orig/star/pax.mk star-1.5/star/pax.mk
 --- star-1.5-orig/star/pax.mk	2008-04-06 20:01:45.000000000 +0200
 +++ star-1.5/star/pax.mk	2008-12-18 16:03:42.000000000 +0100
diff --git a/star.spec b/star.spec
index 705995f..407228a 100644
--- a/star.spec
+++ b/star.spec
@@ -3,8 +3,8 @@
 %endif
 Summary:  An archiving tool with ACL support
 Name: star
-Version: 1.5
-Release: 8%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
 
@@ -14,10 +14,8 @@ Patch1: star-1.5-newMake.patch
 Patch2: star-1.5-selinux.patch
 #do not segfault with data-change-warn option (#255261)
 Patch3: star-1.5-changewarnSegv.patch
-#remove non existing source file in nonfat-makefiles
-Patch4: star-1.5-removenames_c.patch
 #do not conflict with glibc stdio functions (#494213)
-Patch5: star-1.5-stdioconflict.patch
+Patch4: star-1.5-stdioconflict.patch
 
 License: CDDL
 Group: Applications/Archiving
@@ -30,14 +28,14 @@ Star saves many files together into a single tape or disk archive,
 and can restore individual files from the archive. Star supports ACL.
 
 %prep
-%setup -q -n star-1.5
+%setup -q
 %patch1 -p1 -b .newMake
 %if %{WITH_SELINUX}
 %patch2 -p1 -b .selinux
 %endif
 %patch3 -p1 -b .changewarnSegv
-%patch4 -p1 -b .removenames
-%patch5 -p1 -b .conflict
+%patch4 -p1 -b .stdio
+cp -a star/all.mk star/Makefile
 iconv -f iso_8859-1 -t utf-8 AN-1.5 >AN-1.5_utf8
 mv AN-1.5_utf8 AN-1.5
 cp -a READMEs/README.linux .
@@ -80,7 +78,7 @@ ln -s star.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/ustar.1
 
 # XXX Nuke unpackaged files.
 ( cd ${RPM_BUILD_ROOT}
-  rm -f .%{_prefix}%{_sysconfdir}/default/rmt
+  rm -f .%{_sysconfdir}/default/rmt
   rm -f .%{_bindir}/mt
   rm -f .%{_bindir}/smt
   rm -f .%{_bindir}/tartest
@@ -113,6 +111,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/ustar.1*
 
 %changelog
+* Wed Jan 13 2010 Ondrej Vasik <ovasik@redhat.com> 1.5.1-1
+- new upstream release 1.5.1
+
 * Thu Aug 27 2009 Ondrej Vasik <ovasik@redhat.com> 1.5-8
 - provide symlinked manpage for ustar