[packages/star] - updated to 1.5.2 - updated ac26 patch

[qboosh]

commit e7ac89441bf5eb8fa74c9b5d808caa12e54827eb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 12 15:31:09 2013 +0100

    - updated to 1.5.2
    - updated ac26 patch

 star-ac26.patch | 17 +++++++++--------
 star.spec       | 10 +++++-----
 2 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/star.spec b/star.spec
index e8e93ba..1ed9a19 100644
--- a/star.spec
+++ b/star.spec
@@ -5,12 +5,12 @@
 Summary:	A very fast, POSIX compliant tape archiver
 Summary(pl.UTF-8):	Szybki, zgodny z POSIX program do archiwizacji
 Name:		star
-Version:	1.5.1
-Release:	2
+Version:	1.5.2
+Release:	1
 License:	CDDL v1.0
 Group:		Applications/File
 Source0:	ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
-# Source0-md5:	f9a28f83702624c4c08ef1a343014c7a
+# Source0-md5:	5c15cedb52e26b02b95c82de08c5fcc1
 # based on http://www.nsa.gov/selinux/patches/star-selinux.patch.gz
 Patch0:		%{name}-selinux.patch
 Patch1:		%{name}-ac26.patch
@@ -87,14 +87,14 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/default
 
 %{__make} -j1 install \
-	INS_BASE=$RPM_BUILD_ROOT%{_prefix} \
-	MANDIR=/share/man
+	INS_BASE=$RPM_BUILD_ROOT%{_prefix}
 
 install rmt/rmt.dfl $RPM_BUILD_ROOT%{_sysconfdir}/default/rmt
 install star/star.dfl $RPM_BUILD_ROOT%{_sysconfdir}/default/star
 
 # unwanted here (command conflict with tar and mt-st)
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/{mt,tar}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mt.1
 
 # cleanup unpackaged stuff
 %{__rm} -r $RPM_BUILD_ROOT{%{_includedir},%{_prefix}/lib,%{_datadir}/doc}
diff --git a/star-ac26.patch b/star-ac26.patch
index a23762c..44792b3 100644
--- a/star-ac26.patch
+++ b/star-ac26.patch
@@ -20,9 +20,8 @@ diff -ur star-1.5/RULES/rules.cmd star-1.5-ac/RULES/rules.cmd
  ###########################################################################
  include		$(SRCROOT)/$(RULESDIR)/rules.obj
  include		$(SRCROOT)/$(RULESDIR)/rules.dyn
-diff -ur star-1.5/RULES/rules.inc star-1.5-ac/RULES/rules.inc
---- star-1.5/RULES/rules.inc	2007-05-06 14:50:26.000000000 +0200
-+++ star-1.5-ac/RULES/rules.inc	2008-05-14 11:22:39.000000000 +0200
+--- star-1.5.2/RULES/rules.inc.orig	2011-07-16 17:02:16.000000000 +0200
++++ star-1.5.2/RULES/rules.inc	2013-01-12 15:06:31.957140996 +0100
 @@ -19,7 +19,6 @@
  # file and include the License file CDDL.Schily.txt from this distribution.
  ###########################################################################
@@ -31,12 +30,14 @@ diff -ur star-1.5/RULES/rules.inc star-1.5-ac/RULES/rules.inc
  ###########################################################################
  include		$(SRCROOT)/$(RULESDIR)/rules.obj
  ###########################################################################
-@@ -44,7 +43,7 @@
- 		$(LDCC) $(_LD_OUTPUT_OPTION) $(POFILES) $(LDFLAGS) $(LDLIBS)
- 
+@@ -48,8 +47,8 @@
+ #
  $(PTARGET):	$(OINCSDIR) $(PTARGETCX)
--		@echo "	==> GENERATING include file \"$@\""; $(PTARGETC)$(_XEXEEXT) > $@
-+		@echo "	==> GENERATING include file \"$@\""; $(PTARGETC)$(_EXEEXT) > $@
+ 		@echo "	==> GENERATING include file \"$@\""; \
+-		$(PTARGETC)$(_XEXEEXT) > $@ || \
+-		$(CONFIG_RMTCALL) $(PTARGETC)$(_XEXEEXT) > $@
++		$(PTARGETC)$(_EXEEXT) > $@ || \
++		$(CONFIG_RMTCALL) $(PTARGETC)$(_EXEEXT) > $@
  
  ###########################################################################
  include		$(SRCROOT)/$(RULESDIR)/sub.htm
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/star.git/commitdiff/e7ac89441bf5eb8fa74c9b5d808caa12e54827eb