packages: star/star-ac26.patch, star/star-selinux.patch, star/star.spec - u...

Fri Nov 26 21:26:24 CET 2010

Author: baggins                      Date: Fri Nov 26 20:26:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.5.1
- schilly's idea of autoconf means not using standard tools :/

---- Files affected:
packages/star:
   star-ac26.patch (1.1 -> 1.2) , star-selinux.patch (1.6 -> 1.7) , star.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: packages/star/star-ac26.patch
diff -u packages/star/star-ac26.patch:1.1 packages/star/star-ac26.patch:1.2

--- packages/star/star-ac26.patch:1.1	Wed May 14 11:25:32 2008
+++ packages/star/star-ac26.patch	Fri Nov 26 21:26:19 2010
@@ -1,6 +1,6 @@
-diff -ur star-1.5/conf/rules.cnf.in star-1.5-ac/conf/rules.cnf.in
---- star-1.5/conf/rules.cnf.in	2008-05-14 11:20:38.000000000 +0200
-+++ star-1.5-ac/conf/rules.cnf.in	2008-05-14 11:21:46.000000000 +0200
+diff -ur star-1.5/autoconf/rules.cnf.in star-1.5-ac/autoconf/rules.cnf.in
+--- star-1.5/autoconf/rules.cnf.in	2008-05-14 11:20:38.000000000 +0200
++++ star-1.5-ac/autoconf/rules.cnf.in	2008-05-14 11:21:46.000000000 +0200
 @@ -1,7 +1,6 @@
  # @(#)rules.cnf.in	1.17 08/02/20 Copyright 1998-2007 J. Schilling
  
@@ -26,7 +26,7 @@
 @@ -19,7 +19,6 @@
  # file and include the License file CDDL.Schily.txt from this distribution.
  ###########################################################################
- _EXEEXT=	$(EXEEXT)
+ #_EXEEXT=	$(EXEEXT)	# Do not install as xxx.h.exe
 -_XEXEEXT=	$(XEXEEXT)
  ###########################################################################
  include		$(SRCROOT)/$(RULESDIR)/rules.obj

================================================================
Index: packages/star/star-selinux.patch
diff -u packages/star/star-selinux.patch:1.6 packages/star/star-selinux.patch:1.7
--- packages/star/star-selinux.patch:1.6	Wed May 14 11:02:19 2008
+++ packages/star/star-selinux.patch	Fri Nov 26 21:26:19 2010
@@ -91,8 +91,8 @@
  XMK_FILE=	spaxman.mk
  
  ###########################################################################
---- star-1.5/conf/configure.in.selinux	2003-09-13 12:50:23.000000000 -0400
-+++ star-1.5/conf/configure.in	2003-09-16 15:53:48.000000000 -0400
+--- star-1.5/autoconf/configure.in.selinux	2003-09-13 12:50:23.000000000 -0400
++++ star-1.5/autoconf/configure.in	2003-09-16 15:53:48.000000000 -0400
 @@ -313,6 +313,15 @@
    LIBS="$ac_save_LIBS"
  fi
@@ -117,8 +117,8 @@
  AC_SUBST(lib_secdb)
  AC_SUBST(lib_gen)
  AC_SUBST(lib_pthread)
---- star-1.5/conf/rules.cnf.in.selinux	2003-09-13 09:06:41.000000000 -0400
-+++ star-1.5/conf/rules.cnf.in	2003-09-16 15:53:48.000000000 -0400
+--- star-1.5/autoconf/rules.cnf.in.selinux	2003-09-13 09:06:41.000000000 -0400
++++ star-1.5/autoconf/rules.cnf.in	2003-09-16 15:53:48.000000000 -0400
 @@ -8,6 +8,7 @@
  LIB_CRYPT= @lib_crypt@
  LIB_ACL= @lib_acl@

================================================================
Index: packages/star/star.spec
diff -u packages/star/star.spec:1.60 packages/star/star.spec:1.61
--- packages/star/star.spec:1.60	Fri Aug 28 22:09:23 2009
+++ packages/star/star.spec	Fri Nov 26 21:26:19 2010
@@ -6,19 +6,16 @@
 Summary:	A very fast, POSIX compliant tape archiver
 Summary(pl.UTF-8):	Szybki, zgodny z POSIX program do archiwizacji
 Name:		star
-Version:	1.5
-Release:	3
+Version:	1.5.1
+Release:	0.1
 License:	CDDL v1.0
 Group:		Applications/File
 Source0:	ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
-# Source0-md5:	a7b1a5e830935cc1bf1001a558c7f8c4
+# Source0-md5:	f9a28f83702624c4c08ef1a343014c7a
 # based on http://www.nsa.gov/selinux/patches/star-selinux.patch.gz
 Patch0:		%{name}-selinux.patch
 Patch1:		%{name}-ac26.patch
 Patch2:		%{name}-strtod.patch
-Patch3:		%{name}-unamep.patch
-Patch4:		%{name}-gcc34.patch
-Patch5:		%{name}-1.5-glibc-2.10.patch
 URL:		http://cdrecord.berlios.de/old/private/star.html
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -71,19 +68,15 @@
 %{?with_selinux:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 # new ac doesn't like comments in the same line as #undef
-%{__perl} -pi -e 's@/\*.*\*/@@g' conf/xconfig.h.in
+%{__perl} -pi -e 's@/\*.*\*/@@g' autoconf/xconfig.h.in
 # kill annoying beep and sleep
 %{__perl} -pi -e 's/^__gmake_warn.*//' RULES/mk-gmake.id
 
 %build
-cd conf
-cp -f /usr/share/automake/config.* .
-%{__autoconf}
+cd autoconf
+./autoconf
 cd ..
 %{__make} \
 	COPTOPT="%{rpmcflags}" \
@@ -92,15 +85,21 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/default
 
 %{__make} -j1 install \
 	INS_BASE=$RPM_BUILD_ROOT%{_prefix} \
 	MANDIR=/share/man
 
-mv $RPM_BUILD_ROOT%{_prefix}/etc $RPM_BUILD_ROOT
+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 -f $RPM_BUILD_ROOT%{_bindir}/{mt,tar}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{mt,tar}
+
+# cleanup unpackaged stuff
+%{__rm} -r $RPM_BUILD_ROOT{%{_includedir},%{_prefix}/lib,%{_datadir}/doc}
+%{__rm} -r $RPM_BUILD_ROOT%{_mandir}/{man1/match.1*,man3,man5/make*.5*}
 
 echo '.so star.1' > $RPM_BUILD_ROOT%{_mandir}/man1/ustar.1
 
@@ -140,6 +139,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2010/11/26 20:26:19  baggins
+- updated to 1.5.1
+- schilly's idea of autoconf means not using standard tools :/
+
 Revision 1.60  2009/08/28 20:09:23  arekm
 - rel 3; build fixed
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/star/star-ac26.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/star/star-selinux.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/star/star.spec?r1=1.60&r2=1.61&f=u

