Browse Source

star-1.5.3-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10280 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 7 years ago
parent
commit
fdeaf2b66e
1 changed files with 60 additions and 54 deletions
  1. 60 54
      s/star/star-vl.spec

+ 60 - 54
s/star/star-vl.spec

@@ -1,42 +1,43 @@
 Summary:  An archiving tool with ACL support
 Summary(ja):  An archiving tool with ACL support
 Name: star
-Version: 1.5.2
+Version: 1.5.3
 Release: 1%{?_dist_release}
 License: CDDL
 Group: Applications/Archiving
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
+Vendor: Project Vine
+Distribution: Vine Linux
 
-#use gcc for compilation, change defaults for Linux
-Patch1: star-1.5-newMake.patch
-#do not segfault with data-change-warn option (#255261)
-Patch3: star-1.5-changewarnSegv.patch
-#Prevent buffer overflow for filenames with length of 100 characters (#556664)
-Patch4: star-1.5.2-bufferoverflow.patch
-#Fix some invalid manpage references (#624612)
-Patch5: star-1.5.1-manpagereferences.patch
-# note that the H=crc format uses Sum32 algorithm, not CRC
-Patch7: star-1.5.1-crc.patch
+# do not segfault with data-change-warn option (#255261)
+Patch2: star-1.5-changewarnSegv.patch
+
+# Prevent buffer overflow for filenames with length of 100 characters (#556664)
+Patch3: star-1.5.2-bufferoverflow.patch
 
-# fix man-page-day objections
-# ~> proposed upstream:
-#    https://lists.berlios.de/pipermail/star-developers/2013-April/000027.html
-# ~> #948866
-Patch8: star-1.5.2-man-page-day.patch
+# Fix some invalid manpage references (#624612)
+Patch4: star-1.5.1-manpagereferences.patch
 
-# Disable profiling on aarch64 as it's not currently supported upstream
-Patch9: star-aarch64.patch
+# note that the H=crc format uses Sum32 algorithm, not CRC
+Patch6: star-1.5.1-crc.patch
 
 # Allow rmt to access all files.
 # ~> downstream
 # ~> #968980
-Patch10: star-1.5.2-rmt-rh-access.patch
+Patch8: star-1.5.2-rmt-rh-access.patch
 
 # Use ssh rather than rsh by default
 # ~> downstream
 # ~> related to #968980
-Patch11: star-1.5.2-use-ssh-by-default.patch
+Patch9: star-1.5.2-use-ssh-by-default.patch
+
+# Fix broken star.mk in 1.5.3 (included from all.mk)
+Patch10: star-1.5.3-star-mk.patch
+
+# Fix segfault for 'pax -X' (rhbz#1175009)
+# ~> downstream
+Patch11: star-1.5.3-pax-X-option.patch
 
 BuildRequires: libattr-devel libacl-devel libtool
 BuildRequires: e2fsprogs-devel
@@ -80,15 +81,14 @@ restoring files from a backup), and tar (an archiving program).
 
 %prep
 %setup -q
-%patch1 -p1 -b .newMake
-%patch3 -p1 -b .changewarnSegv
-%patch4 -p1 -b .namesoverflow
-%patch5 -p1 -b .references
-%patch7 -p1 -b .crc
-%patch8 -p1 -b .man-page-day
-%patch9 -p1 -b .aarch64
-%patch10 -p1 -b .rmt-access-rules
-%patch11 -p1 -b .ssh-by-default
+%patch2 -p1 -b .changewarnSegv
+%patch3 -p1 -b .namesoverflow
+%patch4 -p1 -b .references
+%patch6 -p1 -b .crc
+%patch8 -p1 -b .rmt-access-rules
+%patch9 -p1 -b .ssh-by-default
+%patch10 -p1 -b .bug-config-1.5.3
+%patch11 -p1 -b .pax-X
 
 cp -a star/all.mk star/Makefile
 
@@ -112,35 +112,34 @@ for PLAT in %{arm} %{power64} aarch64 x86_64 s390 s390x sh3 sh4 sh4a sparcv9; do
 done
 
 %build
-export MAKEPROG=gmake
-# Autoconfiscate
-(cd autoconf; AC_MACRODIR=. AWK=gawk ./autoconf)
-
-#make %%{?_smp_mflags} PARCH=%%{_target_cpu} CPPOPTX="-DNO_FSYNC" \
-# ~~> enable debug by COPTX='-g3 -O0' LDOPTX='-g3 -O0'
-make %{?_smp_mflags} PARCH=%{_target_cpu} \
-COPTX="$RPM_OPT_FLAGS -DTRY_EXT2_FS" CC="%{__cc}" \
-K_ARCH=%{_target_cpu} \
-CONFFLAGS="%{_target_platform} --prefix=%{_prefix} \
-    --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} \
-    --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
-    --datadir=%{_datadir} --includedir=%{_includedir} \
-    --libdir=%{_libdir} --libexec=%{_libexecdir} \
-    --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}" < /dev/null
+# This is config/work-around for atypical build system.  Variables used are
+# docummented makefiles.5.  GMAKE_NOWARN silences irritating warnings in
+# GNU/Linux ecosystem.
+%global make_flags GMAKE_NOWARN=true                                    \\\
+    RUNPATH=                                                            \\\
+    LDPATH=                                                             \\\
+    PARCH=%{_target_cpu}                                                \\\
+    K_ARCH=%{_target_cpu}                                               \\\
+    INS_BASE=$RPM_BUILD_ROOT%{_prefix}                                  \\\
+    INS_RBASE=$RPM_BUILD_ROOT                                           \\\
+    INSTALL='sh $(SRCROOT)/conf/install-sh -c -m $(INSMODEINS)'         \\\
+    COPTX="$RPM_OPT_FLAGS -DTRY_EXT2_FS"                                \\\
+    DEFCCOM=gcc
+
+# Note: disable optimalisation by COPTX='-g3 -O0' LDOPTX='-g3 -O0'
+make %{?_smp_mflags} %make_flags
 
 %install
-export MAKEPROG=gmake
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man4
-
-make install RPM_INSTALLDIR=${RPM_BUILD_ROOT} PARCH=%{_target_cpu} K_ARCH=%{_target_cpu} < /dev/null
+make install -s %make_flags
 
+ln -s spax ${RPM_BUILD_ROOT}%{_bindir}/pax
+ln -s spax.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/pax.1
 ln -s star.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/ustar.1
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}
+mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}
 ln -s %{_sbindir}/rmt ${RPM_BUILD_ROOT}%{_sysconfdir}/rmt
-
-# compat links
-ln -sf spax %{buildroot}%{_bindir}/pax
-ln -sf spax.1.gz %{buildroot}%{_mandir}/man1/pax.1.gz
+install -p -m 644 COPYING star/README  CDDL.Schily.txt AN-* \
+    ${RPM_BUILD_ROOT}%{_pkgdocdir}
 
 # XXX Nuke unpackaged files.
 ( cd ${RPM_BUILD_ROOT}
@@ -152,13 +151,16 @@ ln -sf spax.1.gz %{buildroot}%{_mandir}/man1/pax.1.gz
   rm -f .%{_bindir}/star_fat
   rm -f .%{_bindir}/star_sym
   rm -f .%{_bindir}/suntar
-  rm -rf .%{_docdir}/rmt
+  rm -f .%{_sysconfdir}/default/star
   rm -rf .%{_prefix}%{_sysconfdir}
   rm -rf .%{_prefix}/include
   rm -rf .%{_prefix}/lib # hard-wired intently
   rm -rf .%{_mandir}/man3
   rm -rf .%{_mandir}/man5/{makefiles,makerules}.5*
   rm -rf .%{_mandir}/man1/{tartest,gnutar,smt,mt,suntar,match}.1*
+  rm -rf .%{_docdir}/star/testscripts
+  rm -rf .%{_docdir}/star/TODO
+  rm -rf .%{_docdir}/rmt
 )
 
 %clean
@@ -198,6 +200,10 @@ ln -sf spax.1.gz %{buildroot}%{_mandir}/man1/pax.1.gz
 %{_sysconfdir}/rmt
 
 %changelog
+* Thu May 12 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.3-1
+- new upstream release.
+- updated patches.
+
 * Tue Jun 17 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 1.5.2-1
 - initial build for Vine Linux
 - add Obsoletes/Provides pax to spax